labofsahil/github-event-dataset-2012 huggingface dataset:
Introduce explicit -walletupgrade option

Do not automatically change the wallet format unless the user takes an
explicit action that implies an upgrade (encrypting, for now), or uses
-walletupgrade.

-walletupgrade optionally takes an integer argument: the client version
up to which upgrading is allowed. Without an argument, it is upgraded
to latest supported version. If an argument to -walletupgrade is
provided at the time the wallet is created, the new wallet will initially
not use features beyond that version.

Third, the current wallet version number is reported in getinfo.
remove unused functions from util.h/util.cpp
Give DNS seeds a random age between 3 and 7 days old

This speeds up initial connections with an old/large addr.dat a lot.
Fix URI link to bitcoin-qt.exe instead of bitcoin.exe
Merge pull request #985 from TheBlueMatt/uri

Fix URI link to bitcoin-qt.exe instead of bitcoin.exe
Merge pull request #984 from sipa/youngseeds

Give DNS seeds a random age between 3 and 7 days old
Merge pull request #983 from laanwj/2012_03_removeunusedutil

Remove unused functions from util.h/util.cpp (EOM)
Merge pull request #974 from sipa/walletupgrade

Introduce explicit -walletupgrade option
make sure Window is shown when clicking bitcoin: Links to get user attention
Begin doxygen-compatible comments
Disable bitcoin: URI handling on Windows for the 0.6 release
Merge pull request #988 from Diapolo/URL-Handling

show Window, when user is clicking bitcoin: link
Remove wxWidgets .exe and locales during setup
Use erase instead of rewrite to remove old addr entries
Merge branch 'deladdr' of https://github.com/sipa/bitcoin
Merge pull request #990 from sipa/doc

Begin doxygen-compatible comments
Merge pull request #991 from gavinandresen/disableWinURI

Disable bitcoin: URI handling on Windows for the 0.6 release
Merge branch 'master' of github.com:bitcoin/bitcoin
Merge pull request #992 from gavinandresen/remove_wxBitcoin

Remove wxWidgets .exe during setup
Merge branch 'master' of github.com:bitcoin/bitcoin
Update seeding database when app is starting: automatically create an system acccount and an admin account
Integració fase1 + fase2

Integració de les fases del joc. Es poden col·locar peces de tetris i
quan s'ha acabat el temps es poden col·locar torres. (Una mica lent el
procés de moure la vista prèvia de la torre). La fase 2 spawn de cubs +
batalla (molt saturat si hi ha moltes torres. (Limitar torres?))Fer
tornar a la fase 1 a l'acabar la fase 2.
Hack to restrict hashable so that tests do not fail
turn spell-check off
removed version from uriparser dependency

It appears that any version of uriparser is fine for the command line
interface of querysort. DEB support is also dropped for the 1.0 version
of the lib. instead, it will be built with autoconf for the first
release.
added library archive for the devel package

The overall building and packaging have been slightly reworked. The OBJ
variable has been reintroduced in the make build, because the CLI is no
longer dynamically linked to the library.

This allows cleaner dependencies between packages, and offers
capabilities for static linking for the devel package users. Speaking of
cleaner dependencies, the devel package's Autoreq has been turned off,
since Autoprov in the lib package does't add the shared object
provision.
splitted version into major.minor.patch in RPM spec
the RPM build is now compatible x86_64
Podbarveni na mape imperia, dominantni narody
removed a call to System.exit(-1) if an invalid argument was detected on the command line. Instead, accept any remaining arguments and decide later whether everything we need is there.
modify create_tables.sql to allow creation in an empty sqlite database
Removido Arquivos desnecessarios
Corrigido problema aonde o player podia remover agua/lava com balde
Adicionado checagem para ver se o Player já está ou não esta na lista de
excessões
Erreur trouvée

mais pas encore résolue
Revert "Revert "Decouvrir""

This reverts commit 84e7fffe9dede5a8359d1fb47030fb58b7e23e9b.
First properly working version, incredibly ugly.
Fix SERVER_NAME => HTTP_HOST issue
Up-to-date commit—new tools and posting almost working
Merge branch 'master' of https://github.com/Foundry376/46px

Conflicts:
	iOS/46px.xcodeproj/project.pbxproj
Cleanup
Added more tests and side-effect handling
Work in progress towards a more event driven domain
Merge branch 'master' of github.com:JetBrains/kotlin
switch to using an enum
working filterIsInstance() helper method for filtering on a sub type
Reverting the pull-request #29 due to the upcoming redesign of the lazy collections API
 An exception fixed
wire trace into JavaDescriptorResolver
store namespace kind in trace, kill some JavaNamespaceDescriptor usages

JavaNamespaceDescriptor will be killed soon
kill JavaNamespaceDescriptor
Work around missing jar

Somebody please fix it properly
KT-729 Need to support arrays as varargs: front-end checks done
 #KT-729 In progress
Run js.tests in All Tests
Temporarily revert "kill JavaNamespaceDescriptor"

This reverts commit 3c45a1d60e8eb5c53b816a62eb28cb487ed908da.

This commit breaks compilation of jdk-headers. Explanation:

1. TopDownAnalyzer creates namespace java.util from sources
2. TopDownAnalyzer creates class Map in java.util
3. TopDownAnalyzer processes import java.util.Map.Entry
4. JavaDescriptorResolver resolves namespace java.util.Map
5. java.util.Map namespace is added to java.util namespace
6. redeclaration handler of namespace java.util crashes on Map
CompileJdkHeadersTest
Remove unnecessary code from the test
fix kdoc generation
Run js.tests in All Tests, remove testlib.tests
Fixed test paths in JS tests
ReadMe: require ant 1.8
plugin-publisher: add <idea-version since="IC-XXX.XX" /> to plugin.xml
Fix KT-1639: extend JFrame

#KT-1639 Fixed
corrected type of OutputStream.buffered() and fail if UTF-8 default charset can't be found - thanks for the heads up Stepan! :)
Working on fix
Merge branch 'master' into dev
Resource management skeleton
Agregado a la línea principal de desarrollo la app servidores
Typo fixed in fabfile
add Column reorder with resize plugin

from: http://datatables.net/extras/thirdparty/ColReorderWithResize/
- Fixed text for quest 1821

Agamand Heirlooms (1821)
Changed an actual player name to $N.
contact faq privacy policy
Allow grouping types to extend for a convenience. 
Add tests for grouped extensions.
Version 0.2.3
Make possible to implement protocol for type if already implemented by ancestor.
improve property names.
Implement some code examples.
Version 0.2.4
echidna 1.5.9
logging in dataset
Sleepmon gnuplot graphing
Kansio HerkkoVirolainen lisätty
Add ~/bin to /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/openmpi-1.4.2/bin/:/home/temple/santuz/tools/mendeley_1.1.3/bin
Update
Added some new entries to style.css for possible update of home page.
Use feature on staging
Merge branch 'feature'
Get rid of the password from here
Update the myfonts api url and make the update script to work
Merge branch 'master' into feature
add root fs script from clfs
The function put in database.php is now able to return the last inserted id. It's very useful for verification scripts
still tinkering with main nav li alignment
improved keyword highlighting
add new featured slide code

new plugin installed too.
fix bug: EventManager::emitEvent()
Model::back() to switchPrototype() ; 添加关联时不会切换 prototype
add getDoAction for get doAction state
Added exts
update 10.11
dlsym: get rid of more dlsym usages in extras.
starting to think about more efficient, flattened struct representation
Merge branch 'master' of github.com:JuliaLang/julia into jb/structlayout
work on computing struct offsets
Merge branch 'master' of github.com:JuliaLang/julia into jb/structlayout
Merge branch 'master' of github.com:JuliaLang/julia into jb/structlayout
Rework sphinx julia parser to include extras in helpdb.jl.  Addresses #946.
Add pretty printing for AST:s.
Add show for expr ::T. Fixes 1180
Work around for #1183.
Remove extraneous '=' from glp_del_cols help description.
Merge pull request #1184 from kmsquire/doc_updates

Rework sphinx julia parser to include extras in helpdb.jl.  Fixes #946...
Update doc/manual/strings.rst

strchr now returns 0 (instead of an error) when no matches are found.
Fix merge conflict.
some touch-ups to the helpdb improvement
Update doc/stdlib/base.rst

strchr now returns 0 (instead of an error) when no matches are found.
removing over 30 redundant definitions of assign() by merging a few pairs of functions with a conditional
fixing an llvm IR type error
Vectorized and devectorized versions of the laplace benchmark now
give the same results (#1168)
Merge branch 'master' of github.com:JuliaLang/julia
laplace implementations in other languages.
Thanks Rajeev Singh and Scipy folks (http://www.scipy.org/PerformancePython/)
improve compile-time evaluation of module references
Allow fixed-precision printf printing beyond 17 digits.

Closes #858, mostly: we could support arbitrary-length printf
decoding, but we'd have to dynamically allocate or grow the
buffer that the digits get decoded to. Doesn't really seem to
be worth it.
Merge branch 'master' of github.com:JuliaLang/julia
Add factorizations to the test suite.
fix distributions test hang
First work towards LLVM 3.1
small typo
reenable optimized build
pkg: intelligent repo merging now works pretty well.

Also, Julia versions should be marked as dirty if there are diffs
that are staged or unstaged. This can be checked by comparing the
working tree with HEAD instead of the default which compares all
unstaged changes with the index.
Merge branch 'master' of github.com:JuliaLang/julia
Merge branch 'master' of github.com:JuliaLang/julia into llvm31

Conflicts:
	deps/Makefile
some LLVM 3.1 fixes; ctlz and cttz
fix #889 and #890
Get rid of USE_QUIET in Make.inc
Merge branch 'master' of github.com:JuliaLang/julia
Merge branch 'llvm31' of github.com:JuliaLang/julia
disable verifyFunction
fix #885
add intrinsic for mod(), #876
make % mean rem instead of mod. closes #876.
Merge branch 'master' into install
Fix paths for sys.ji and sys0.ji to live in usr/lib/julia
-nerdtree +syntastic again
I'm sure I'll redo this later, been pushing off keybindings.

Just add up-line-or-search for now.
Credit where credit is due
player directory reformat
Global hotkey works on X11
Global reformat
Update GitHub project to Demo Application

- Edit a lot of UI in views/...
- Add models/Rule.java, and controllers/Rules.java
- Still need to complete some features: Vote Time, and User Setting
merge Server and KatelloServer classes

addressing pylint:
R0922:157,0:Server: Abstract class is only referenced 1 times

No one reference Server class but KatelloServer, which inherit from it.
Do we assume some other serveer then Katello? I do not think so.
Merge pull request #558 from xsuchy/pull-req-mergeServer

merge Server and KatelloServer classes
cli test - adding new test for template deletion
862753 - fixing typo in template deletion
Merge pull request #842 from lzap/new-cli-test

865397 - fixing template delete and adding new cli test
api docs - errata controller
move service-wait to katello-common

package katello is not installed when you install headpin, therefore
katello-configure --deployment=headpin fails with:

err: /Stage[main]/Postgres::Service/Service[postgresql]/ensure: change from stopped to running failed: Could not start Service[postgresql]: Execution of '/usr/sbin/service-wait postgresql start' returned 1:  at /usr/share/katello/install/puppet/modules/postgres/manifests/service.pp:15
err: /Stage[main]/Postgres::Service/Exec[wait-for-postgresql]: Failed to call refresh: Command exceeded timeout at /usr/share/katello/install/puppet/modules/postgres/manifests/service.pp:25
Merge pull request #437 from xsuchy/pull-req-service-wait

move service-wait to katello-common
Fixed relocation trouble when using guest account.
mv api api-server

In preparation for the client documentation
init user can see accepted bids
Service met Logger v0.1
Merge branch 'master' of github.com:KeyTech/KeyTech
Gmock framework toegevoegd
Set apc.stat to 0 on advice of epriestly.  This should speed up phabricator.

Summary:
apc.stat==0 means 'don't check if a page has changed, every time it's
requested.'  Since we change pages once a day (at most), apc.stat==1
means a lot of extra checking.

The cost is that every time you want to update phabricator, you need
to restart the webserver.  A small price to pay for performance.  I'll
write an update script to make that easier.

Reviewers: benkomalo

Reviewed By: benkomalo

Differential Revision: http://phabricator.khanacademy.org/D939
Fixed bugs: PluginList not saving State on orientation changed, firing
event when it should not and wrong loop count when saving
Version 4.0.5 - Suppression du message 'JVCMaster 4.0.4 JVCMASTER IS NOT FOUND :rire2:'
Removed experimental updater
addition of the phone tag
Update Master
Merge pull request #97 from Arente/patch-45

Update Master
Used pokemon black 1 and several translating tools to edit (i'm just learning japanese)
Merge pull request #117 from beschoenen/patch-1

pokemon translate
Update master
Merge pull request #156 from Leanny/patch-13

Added 3 lines
Update master
Merge pull request #105 from scream12345/patch-34

Update master
Update master
Merge pull request #206 from mafiox/patch-91

Some translated 2/0264
Per my test, axis-based sorting is faster than distance-based sorting, and can improve QBVH traversal by a factor of 20%, so we corrected the encoding of split axis which used to conflict with the definition of empty leaf node.
Suspend and resume audio device (fixes sound problems when phone calls)
Add a crosdomain.xml file
Timer package done
Merge branch 'madsim'
Small fixes. Fixed some on menu, cleaned up some code. Fixed a minimum CTF

Signed-off-by: eXpliCo <johansson_@hotmail.com>
Merge branch 'master' of github.com:Malow/PowerBall

Conflicts:
	PowerBall/PowerBall.vcxproj.filters
	Source/GameManager.cpp
	Source/GameManager.h
Refatorado o código de desenhar os eixos
eclipse-4.2RC3-1
Renamed Banana to Madness
Next step for Map
Fixed a few bugs and attempted to address Bug #20
opencl syntax highlight inside and outside python
plugins/RSS/locale/fi.po: update headers.
Fix commit ed5f79c0.
schedule: Add parameters args and kwargs.
AutoMode: Add configurable delay. Closes GH-188.
Web: Fix encoding issues in title snarfing and @title.
Merge remote-tracking branch 'progval/testing' into testing
Add the channel where a command has been called in the logs ('XXX called by XXX').
URIUtils: add UpdateUrlEncoding
[test] add unit test for URIUtils::UpdateUrlEncoding
videodb: translate filenames/paths to not URL encode -_.!() (fixes #13433)
musicdb: translate filenames/paths to not URL encode -_.!()
release: bump versions for August merge window
Added FileRepository to Data
Add comments to name_server.lua
So, I tried changint eh movePiece() method to fix the issue we're
encountering with the driver. To me, it looks like the new blank just
isn't getting added to the piece's original location once it moves,
because when we get to printing that original location, it comes up as
null. It seemed like the issue was that changeLocation() wasn't being
called to update the location of the blank to the original location, but
that still hasn't fixed the issue. It hasn't hurt anything, so I'm
adding this to see if you guys are perhaps able to play around with it
an potentially find a fix.
small changes to pieceCanMoveToPosition(parentheses changes)
recommit
rerecommit
Merge branch 'master' of ssh://git@github.com/MrClement/Chess.git
Automated Mongoose retrieval and compilation.
Revert "Revert "test""

This reverts commit c01ba7001aaa07a559bbff8553cc4c5482af4bc5.
test version
test for B/R device
changed default to enabled for restart round / next round confirm pop-up.
added support for global_vars.def. It only allows procon.protected.vars.set to be used for example to override max chatlines defined in gameconfig.defs globally
Board cells almost draw themselves
Hide elemnt for property function of alert animation
convert _oneof to Scala
Adding ability to import world from a URL
Merge branch 'signedjars' of github.com:NetLogo/NetLogo into signedjars
read port number and username from applet parameters
overrides and correct defaults
widen the port range
Upgraded to 2.0.0!
cleaning files which not used on other htc kernels
@write vfs and log module(%50)
fix and improve builtin var cast
Deleting now-obsolete known solutions
Use the theme with dark action bar, to make icons look better
Add "output_vtk" parameter, split output function in two.

Vtk and Matlab output now happens in two different functions.
Improve reporting of volume balance.

Should now give more accurate results when taking multiple substeps.
Stop writing ascii output twice.
Improve function comment.
Reinstate 10% ad-hoc c-interval overestimation.
Improve function comment (similar to in SimulatorPolymer).
Make output work the same as in other sims.

I.e. putting each field in its own directory, adding the
output_vtk parameter etc.
Reinstate 10% ad-hoc c-interval overestimation.

Similar to in TransportModelPolymer.
Fix for case with incompressible rock.

Made rock comp argument optional in computePolymerAdsorbed().
Check inside func for active rock comp.
Fix mass balance report.

Now reports surface volumes for water and oil, instead of useless
(for mass balance) reservoir volumes. Also makes the case with
multiple transport steps more accurate.
Merge pull request #1 from atgeirr/master

Fix mass balance reports and output.
Fixing cookies issue with setHeader changing behavior
Rearrange docs for clarity.
Rework domain
First set of improvements and workshops
[merge 3.0.2] Minimally validate AUI perspective load
Correct UNC update logic for non-standard dir structure
Rewrites OELibrarySplitView.m Fixes #313.
Implements the Rename Game context menu item on the list view, solving part of issue #154.
[PowerTimers] more tweaks.
openvix: build 205
bootstrap fix
merge
updates
Merge branch 'master' of github.com:Orchive/Orchive into francis
can favorite own posts and fixed favorite routing
只完成了页面合成 一些地方还搞不清楚 暂时不能完成。 for #118
完成回复评论，但是JS的第二个函数，也就是检查是否已经不是回复某人的函数有些问题，会把正常的回复某人改为回复新闻，for #118，@richarddong，@pzi1win2go3
Merge branch 'feature/reply-comment' of github.com:PKUIRSA/pkuzone into feature/reply-comment
close #118
Merge branch 'feature/reply-comment' into develop
added ability to use a resource for the lock screen image
оптимизировал и закешировал вычисление значения ТОР-рейтингов
отладка ]
Correct highlight to render
TESTS: Added a couple of tests to print-test.r
New gemspec. OH! LOVELY GUVNUH!
stop word list
Decisionmake now finds the ends of the rows as they
can be seen in the row/boxes.
[README][s]: setup instructions for running tests.
Merge branch 'master' into issue-250-scheduler-least-run-first
0.31

Signed-off-by: pyros2097 <pyros2097@gmail.com>
l
Merge branch 'master' of https://github.com/QLeelulu/ohlala
Moved Queue's Entry struct into the Queue struct.
Changed the readme to be slightly more informative
added windows commands and gui commads
Commit from gino
Switch to JOGL 2.0 Release Candidate 11. The original code of this port
was hosted on http://sourceforge.net/projects/ardor3d-jogl2/
Merge pull request #4 from gouessej/master

Switch to JOGL 2.0
Added dictionary with GUI from wxPython
Various changes to correct js problems
Charges to specs, still some specs not working
All model and controller specs working. Some features still not working (spending report)
Worked on testing of liaison ability to view current vs. noncurrernt programs
Completed testing of standard registration and scheduled views.
Work on excluding prior scheduled groups from view.
Work on excluding prior scheduled groups from view.
vimrc: CoffeeScript indent rule match Cakefile as well as *.coffee
Lowercase the right thing
Update README.md

definition of the contents of this project with respect to the other ones.
bischen Dokuu
support jruby on travis per @hakanensari
Fix vfd driver for venton (previous commit broken)
modified the interface functions to return values instead of outputting directly.
Merge pull request #2 from pmeth/master

merged peter's changes for more modularity
layout fix for firefox
new layout view posting
placement stopwatch paginator
updated schema files
bumped version string
...
more or less sustaining itself; simple loop solution found as well
start work on live tv
Fixed autoloading bug.
Just changed the README for the docs generation process.
Trying to correctly construct the local path
Lives added
Заготовка фрейма строительства.
Added libraries and JDBC Exception handling
- Converted marker.
Finished wrapping output writer stream in forevertransport to escape inline script tags
Made some modifications to hubify.exe.
- Don't print the output of the copy operation.
- Run hubify from the bin folder of the sample app.
Bring in new lock free message store and use a cursor per key.
Adding SystemWeb for net45 and updating WebSockets

Advances Katana reference
Updates for final ws owin spec
Fixing merge conflict
Simplified WriteUlongAsHexToBuffer
fix missing binding option
trying a different transition
Working day commit 2/04/12
230312
dodane nove vrstice pri headerju
Распознавание локальных или относительных от корня путей для шаблонов.
accomodations.added region to search, showing prices based on nights count
Change the way Unicorn restarts
Changed to use zip-filter
Added softdepend on WG.
Added modified Makefile for easier toolchain.

A finished Curses frontend is just around the corner.
ajout classe card
remove duplicate files following kroll merge
Fixing issue with installer - c++ namespace change related change
Renaming kboot to tideboot
Start code to filter conditional deletes
add analog in/out to product overview
loop filter values for PFD at 1.6 MHz
Fix 'rename.html', using sed's hex ('\x??') notation.
javascript
works again
works better
merge
travis: test node v0.8
CLOSED - issue GWDP-355: IL EPA Multi-Site Download Missing Files 
http://internal.cida.usgs.gov/jira/browse/GWDP-355

Use _ for space in agency name when constructing Cocoon URLs.
CLOSED - issue GWDP-355: IL EPA Multi-Site Download Missing Files 
http://internal.cida.usgs.gov/jira/browse/GWDP-355

Improve logging.
OPEN - issue GWDP-383: Ability to disable FileCache 
http://internal.cida.usgs.gov/jira/browse/GWDP-383

If basedir is null, FileCache is disabled.
OPEN - issue GWDP-383: Ability to disable FileCache 
http://internal.cida.usgs.gov/jira/browse/GWDP-383

Clean up disable code.
Add switch for all MSIL opcodes and implemented some

Note: doesnt work atm, needs more opcodes implemented
Added more opcode implementations
A few updates in tracer
Some work on stacktracer
Small fix

Commented out unused code and merged ldc_i4 and ldc_i4_s case.
gitignore
Revert "gitignore"

This reverts commit 0e8f36521081f964f2622628d53af36827d39846.
gitignore
Update cas-sample-java-webapp/README.md
webstart build with gradle (2)
4.3.14 rc1
Je m'embourde...
Provide a way to configure launcher icon positions.

We can also extend this, later on, to persist our icon positions when
we have reordering.
Allow for system-wide overriding of the launcher locations.
bump version
change path per request
Show notifications if they have either a body or a summary text

Not all legacy notifications have both.
[TC] Core/Players: Do not allow polearm to be equipped in the offhand.
[TC] DB/Game Event: Update Darkmoon Faire start times
[TC] DB/Quests: Fix "Homeward Bound" completion text
[TC] Core/Player: Fix wrong check in 7a8652c
Update Library, ajaxadmin tpl, formatting lang controller
Update kxp.py
added array support for is type
extended the js_conf example
improved error message
improved documentation
added setStatus
improved error message
fixed redirect
Apparent debuff highighting fix
version 4.66
Minor change
Color guild bank item buttons to match item rarity.
Fix pixel perfect still getting forced upon users.
bah this should be it
Version 4.67
long day, this was right the other way around
wtf?
move theme variables to a private database
another profile fix
Version 4.68
Another profile fix.. this is going into the current live version as it can only help people downloading from this point on.
Rpi-hw 0.1 - fix3
Zooming and resizing of canvas implemented + bugfixes.
Fixed the build script.
fix splitstatus
Commented out everything in the zchat test, since it'll add a lot of
stuff to the database every time it runs
Merge branch 'master' of git@github.com:Z-app/zmoteTest.git
Readme updated, plugin template added
plugin joined with natural-sort.js
Fixed splitter creation bug with map(), added test page
Implemented quite all math operations. Also, made first thoughts about the CTFE stuff and how it'll be handled later on
all tests passing
almost ready to deploy to the live site for 2012
Adding list view for cafes found
Added Control-T mapped as ,t. Updated to non-slow minibufexpl.
The initial commit of the Dynamic Document Generation plug-in source code and supporting files.
śro, 2 maj 2012, 14:15:45 CEST
added the asmlib
better looking info page
added gps stopper, navigation stabilized
unittest: fix py2.6 bug, use ssh for test repo, add github.com auth in travis-ci
simplify config format

permits null values for binary values. specifically, base and
requires_signature. they no longer need to be specified in defaults
Add Commitlog Versioning
patch by Vijay; reviewed by jbellis for CASSANDRA-4357
Fix License headers and add assert which was missed.
Merge commit 'refs/top-bases/p/3881/00_snitch_topology' into p/3881/00_snitch_topology
Merge branch 'p/3881/00_snitch_topology' into refs/top-bases/p/3881/01_calc_natural_endpoints
Merge commit 'refs/top-bases/p/3881/01_calc_natural_endpoints' into p/3881/01_calc_natural_endpoints
Merge branch 'p/3881/01_calc_natural_endpoints' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/03_group_stream_out_ranges' into p/4122/03_group_stream_out_ranges
Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools
Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools
Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path
Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path
move topology tracking into TokenMetadata from the Snitch
Merge commit 'refs/top-bases/p/3881/01_calc_natural_endpoints' into p/3881/01_calc_natural_endpoints
update NTS for updated topology tracking
Merge branch 'p/3881/01_calc_natural_endpoints' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
merge
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4125/01_admin_tools
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools
fix merge
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4125/01_admin_tools
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools
Merge remote branch 'refs/remotes/origin/top-bases/p/4125/01_admin_tools' into refs/top-bases/p/4125/01_admin_tools
Merge remote branch 'refs/remotes/origin/top-bases/p/4122/02_remove_tokens' into refs/top-bases/p/4122/02_remove_tokens
aligning to pagodabox
try htaccess to fix url issue
adding curl
trying htaccess
trying .htaccess again
see if .htaccess is even used
try #18
simplify phco.compare
register / login with facebook

register / login with facebook
Structs continued
First version of Selenium 2 step support overview table.
Massively sped up waits.
update The Basics
Update window title
Link highlight group
Use solarized
remove the declaration of a non-existing function
Updating readme to reference wkhtmltoimage
KVM: PPC: Use clockevent multiplier and shifter for decrementer

Time for which the hrtimer is started for decrementer emulation is calculated
using tb_ticks_per_usec. While hrtimer uses the clockevent for DEC
reprogramming (if needed) and which calculate timebase ticks using the
multiplier and shifter mechanism implemented within clockevent layer.

It was observed that this conversion (timebase->time->timebase) are not
correct because the mechanism are not consistent.
In our setup it adds 2% jitter.

With this patch clockevent multiplier and shifter mechanism are used when
starting hrtimer for decrementer emulation. Now the jitter is < 0.5%.

Signed-off-by: Bharat Bhushan <bharat.bhushan@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Add extra module to get updated and created time from git
Fix docs
原材料准备就位
双枪将董平 参上！
改造淫欲
无视防具部分目前仍继承青釭，无法被奇门影响
为2.5发布做足准备
剧情模式解耦合
Symfony Standard 2.0.12
added glyphish attribution
ooops from aad6b77, also handle when match is a list of unicode strings.
make the hawkey version available in the API.

also from py.
doc: use the actual version for doc generation.

To do this, doc/conf.py imports hawkey. This needed some changes in the cmake
for the doc. Also I discovered there is a bug with efeb04c causing only the
manpages (not the html) being built.
add missing epos.Expression call to documentation.
add clock injection to mocktagdao
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
	account/src/main/java/com/ning/billing/account/api/user/DefaultAccountUserApi.java
	analytics/src/test/java/com/ning/billing/analytics/MockAccount.java
	api/src/main/java/com/ning/billing/account/api/Account.java
	api/src/main/java/com/ning/billing/account/api/AccountUserApi.java
	api/src/main/java/com/ning/billing/util/api/TagUserApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccount.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/BrainDeadAccountUserApi.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/TestDefaultEntitlementBillingApi.java
	invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
	invoice/src/test/java/com/ning/billing/invoice/glue/InvoiceModuleWithEmbeddedDb.java
	invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
	util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionUserApi.java
	util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java
	util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
invoice audit
added check for created and updated dates for account migration
Minor change for tests to pass in localtest settings
README.md
remove deletes fromt eh system (excepting tags and custom fields); also removed undoMigration as a consequence; fixed type in PlanPhaseSpecifier
move MapperBase and BinderBase; introduce ChangeTypeBinder; add history to tags; fix InvoiceDaoTestBase to remove reference to account/ddl.sql
Fix guice circular dependency between SubscriptionFactory <-> SubscriptionApiService <-> EntitlementDao
Fix wrong use of entitlement DAO from invoice module
Continuation on guice fixing circular dep in entitlement (test part)
add auditing to invoice payments
auditing for entitlements
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementSqlDao.java
	entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java
Changed payment api to not return error for 0 invoice
Merge
updated poms for release; changed number of decimals in invoicing; fixed tests
changed pom version number back
[maven-release-plugin] prepare release killbill-0.1.8
[maven-release-plugin] prepare for next development iteration
updated lots of stuff, added new experiments
Add the directory  if we are building on Unix-based operating systems.
test commit
commit2
Merge pull request #1 from plsdevelopment/test1

Test1
new blog article
cosmetic changes
명사추출기의전체프로세스를돌기위한클래스를전부추가하였다.(아마도전부이기를...)
아직메쏘드명불일치등으로동작하지않을것이지만일단체크인
adding index.php back in
Updated README examples further.
[F] bugs
Get rid of grey bar by steps on IE
This looked broken to lots of people and makes more sense to make this just look like a normal numbered list rather than keep receiving bug reports from something that looks odd and non-standard.
Copy change

Changed the copy slightly to make it friendlier.
Change guides-print to scss
Refactor print styles to match whitehall

Print CSS refactored to include styleguide partials and to keep
all included files in one place (as in application.scss).
Merge branch 'typesetting' of github.com:alphagov/static into typesetting
Add print sizes to fonts & hide cookie notice

Include font-size for print in the font mixins in
styleguide/_typography.scss, allowing them to be used in CSS for print.
Replace font-size with reference to typography mixins
Merge branch 'typesetting' of github.com:alphagov/static into typesetting
Missed the closing > on a named group.
bumping version to 0.7.6
added correct pdf and updated headers
turn on indentation
household id has been fixed
Major refactoring of abolt. Added in mlbolt things and tightly integrated the simulator with the real world
moved to VS2010 and Havok SDK 2010-2-0
initial support for bhkCompressedMeshShape
added .gitignore
Merge pull request #1 from skyfox69/master

Fix for multi-material meshes, creating mopps for Skyrim nifs.
enable fuel-twitter
delete submodule
delete submodule
Fixed display of newest item when used while still visible
Fixed bug in animating fireballs
Simplified some roombuilder code
Merge remote-tracking branch 'upstream/master' into fix-notification-cleanup
Allowing different domains in the matcher
Merge pull request #1014 from etiennesegonzac/fix-notification-cleanup

Fixing the cleanup of the notifications when the app (dialer/sms) opens
Изменил контрол на форме неявок.Изменил модели для поддержки значений свойств модели.
1205151647
queue class/tests added
return to dispartion
change grey level
Added TransAssert to RemoveUnusedEnumMember
Merge pull request #7 from annulen/assert

Added TransAssert to RemoveUnusedEnumMember
Merge pull request #8 from annulen/remove-enum-member-value

Added remove-enum-member-value pass.
Refresh the Automakery.
Added remove-enum-member-value to creduce.in
More progress on nextgen GMake action

--HG--
rename : tests/actions/make/test_default_config.lua => tests/actions/make/solution/test_default_config.lua
rename : tests/actions/make/test_help_rule.lua => tests/actions/make/solution/test_help_rule.lua
remove slf4j from parent dependency section so it is explicitly included as needed
fix WeightedProviderComparator algorithm design so it doesn't rely on the absolute values for weights when comparing and verify using a simple test
make LockableMGraphWrapper equals compatible with other LockableMGraph implementations
add notes and throws UnsupportedOperationException to TcProviderMultiplexer
make UriRef.equals nullsafe
cleanup in TcProviderMultiplexer
Wrap getpwnam in try/except in authorized_key module

This also adds module as an argument to keyfile().
Merge pull request #1556 from sfromm/issue1099

Wrap getpwnam in try/except in authorized_key module
Some caching improvements to paramiko which are still not yet fully leveraged
in playbook mode, since the Runner still closes abstract host connections completely
and does not have a LRU.
This should set the sender properly.
Merge pull request #1315 from dagwieers/mail-callback-improvement

This should set the sender properly.
[LIMS-1060] -added default filter to litterlist criteria which filters
out terminated cages
280: createOrUpdateEndpoint supports MySQL.
Increase timeout due to too many spurious test failures.
Uppdaterade mallen
footer on dashboard
added build.properties
"Fixed" tests
small fixes
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Add test for content assist on an interface field of a module
Fixes for content-assist code
Merge remote-tracking branch 'upstream/master'
Doc gen internal browser
Add $psprintf as keyword
New tests
""
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChangeLog.txt
""
Correct error with pre-processor expansion of empty macro (`)
Fixes for static content-assist references
Merge remote-tracking branch 'origin/master'

Conflicts:
	sveditor/plugins/net.sf.sveditor.core/src/net/sf/sveditor/core/expr_utils/SVContentAssistExprVisitor.java
Update to build scripts to support bundled Zest
Merge pull request #97 from mballance-sf/master

Bug Fixes, etc
Update build script to include Zest in the release
Fix for bug #3545640 -- support of macro definitions with default-value
parameters
adding functionality to the di container which allows it to create and load dependencies that are fixed and need no builder
Upgraded to Maven Antrun Plugin 1.7 to fix regex issue.
Keep Maven Antrun Plugin at 1.3 for running Canoo Web Tests.
Use GitHub source for Flume
Make flume.spec rules independent of source tarball top level directory
Flume do-component-build should set hbase.version
Dist tarball regex in flume install_flume.sh must handle more variation
Recent versions of Flume drop some doc files
Recent Flume versions will not install Hadoop artifacts into lib/
Recent Flume versions will put site docs at lib/docs/, remove them
[LPC] added .project file.
working on testing new data
Added GPLv3 banner to footer right.
Removed pyc files. Added a gitignore.
reorganize chalet project
Work through lesson
Switch config scheme for easier updates
padronização do build
Merge branch 'v0-9-6' of https://github.com/asantee/ethanon into v0-9-6
added something to the copy command for options mennu icons. Might fix the current bug on Mac OS
Merge remote-tracking branch 'origin/ThreeOne' into ThreeOne
small changes to the winphone builder. Another atempt to fix the mac os issue
WP7 CameraModule: the camera format is now correctly set; added some comments; refactored some methods
MOSYNC-2296: fixed the ads test program (added a new Banner constructor with the windows phone ads test ids and changed the platform checking function); fixed a crash on the windows phone platform
Fix for the mac building issue
Fix for the camera preview aspect ration on horizontal orientation
conflicts fixed spiri/ThreeOneOne on MoSyncCameraModule.cs
fix for panoramaView. When navigating back from a screen (datepicker page) into a dialog launced from a panormaView child it would reset the current screen of the panormaView to the first one. The screen should be preserved in such situations. Now it's fixed.
MOSYNC-2292: because there was no resources file inside the CameraDemo application, the mosync runtime didn't initialize the mCurrentResourceHandle to 1 so the maCreatePlaceholder returned 0 on the first try. The variable is now initialized inside the runtime constructor
Merge remote-tracking branch 'github_origin/ThreeOneOne' into github_sandbox_threeoneone
added an extra condition to assure that the child removal process will not
throw an out of bounds index exception.
merged with origin/ThreeOneOne
Merge remote-tracking branch 'spiri/ThreeOneOne' into ThreeOneOne
readded the camera preview fix, it got lost during conflict resolving
[SQLITETWOEIGHT-3] Android: Implementation of maDBExecSQLParams (work in progress).
[SQLITETWOEIGHT-3] Android: Implementation of maDBExecSQLParams (almost complete, some work left, a bit of cleanup), also updated DatabaseTest example program, and updated a print statement in testPrograms/DBTest.
[SQLITETWOEIGHT-3] Android: Forgot to commit the actual implementation file!
MOSYNC-2333: Added the proper environment variable to Info.plist for Mac OS X 10.8.
[SQLITETWOEIGHT-3] Android: Finished implementation of maDBExecSQLParams and updated example test program. Note that BLOB fields do not work in WHERE clauses.
Adding vim-style command line editing for zsh
Change bootstrap interpreter to bash
Nested lists work 3?
Only use double quotes
No need for static classes singletons
Changed Value_GetInteger to use lua_number2integer
Merge branch 'master' of https://github.com/asraniel/rocket
Map them all.
bg.image.js.reCSS
bootstrap + crud1
now replaces species name with strain name if species name is actually just "bacterium"
version bump
Regenerate gemspec for version 1.3.5
add list delete edit
mpcommon
quote will be sent on sales@motrpart.in
fix view cart pop up
Path for 2012 calendar
[travis] Drop support for Ruby 1.8.7

It's ancient, will be unsupported next year and fails tests.
Upgrade Bootstrap to latest version
Works with Bootstrap v2
First draft for marking half days
Half days can be saved
Completed implementing half days
Disable button to mark half days when there's no vacation
Added some comments and removed an unnecessary export
split upstart configuration files to include /etc/default/job-name.
rename tests/vdc to tests/vdc.sh.d.
fix wrong folder name.
OSSP lab4 DLL interface
Rectified some differences between master and work branches
MR image filter
MR image management
comments added
Added Tests and data for MR rendering
comment added
Merge branch 'renderingMR' into OpenMAF-2-2
tree restructuring ongoing ...
Adding a temp TODO list
restore save map
Address high memory usage by riak_core_sysmon_handler.

Fixes CORE232

Change riak_core_sysmon_handler to use hibernation to free up
resources when it is idle since it does not do a good job of freeing
these resources on its own. Also force garbage collection on the
riak_core_sysmon_handler process if it receives a large_heap message
about itself. This is to avoid a feedback loop that can lead to severe
memory usage by the handler, node slowness, and even cause the node to
crash after consuming all available memory.
Wait for the specified services (or riak_kv by default) when deploying nodes.
Cleanup dat whitespace.
Merge pull request #95 from basho/sdc-fix-build-cluster

Wait for services when deploying nodes.
Fix the bundler invocation so it works in a more isolated fashion.
[Make] Added SCREEN_TYPE
second fix for missing "last" entries
Many changes:

1. Ripped out ripple and will be now relying on the riak ruby client for
data access
2. Added code metrics tools
3. Upgraded some gems, removed others
set infinite timeout for IM notifications
added categories to course.value
added timetables
fixed added course to timetable, fixed new timetable assignment
added timetable test case
added categories
fixed commit, fixed delete method :hungry:
added categories test case :cake:
added schools
fixed remove action
added schools test case
trim tail blank space
added some stuff missing from the master branch
Made ABOUT tab be default left justified
updated tasks for rake
remove duplicate print statement
Try to reorder installation
removing textile -- this is why we have textmate
nerdtree opens automatically
Typo: to many of these '-' for mailto option
added option for hosted bertas to hide berta copyrights, works only in SHOP and PRO plans. Option can be found under settings-Other settings
Avoid including npm as a dependency; parse the `npm -g root` output directly.
Update vendors.
Update docs to include method aliases.
improve test class for IndexServer
adc: Pass adc_t to callbacks
Makefile: Clean with rm -f
adc: Disable DMA stream on stop
beagle_spi: Add missing #include <stdint.h>
Move ADC trigger management into adc module
test out bower dependancy changes
telnet examples test ok
new post about .DS_Store files
Exclude INA and the ^Char- uploads from #perl
c naming for structs
Implemented fix for issue where by zero-length attachments would cause MySql crashes to occur (similar to this issue https://nhibernate.jira.com/browse/NH-2096 in NHibernate).
Updated couchpotatoserver description with spanish language
wygwym initial commit
Merge branch 'master' of github.com:blerchin/wygwym
cambios en raiz
Merge branch 'master' of github.com:bloomtec/ez-cms
report several types of "done" timings
marked done
complain and exit if logdir's base isn't present
[premake]
* now building in _build folders
* changed premake file names to p4-<project_name>.lua
* added platform as a premake option (current platforms are windows32, windows64, linux32 and linux64
* added platformName global variable to hold the current platform being built
* renamed platform specific files according to new platform names
updated doc for release 0.3.0
Revert "Initial commit."

This reverts commit d50ee80b9322e78c40c6a8c0c728de9fe939c6d1.
The andromeda commando has landed
Add android client
Merge branch 'master' of https://github.com/boo1ean/bom-bom
fixed table name
refactoring methods in Data
Removed attribute "level". Added a method of checking whether an object file
Added initialization of the column level
class Section is made abstract
Reconstructed
Reconstructed
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into dev
Update Classes/SDKFiles/BoxLoginViewController.m

Changed loadView to handle landscape orientation
Merge pull request #12 from sverin/patch-1

Update Classes/SDKFiles/BoxLoginViewController.m
classes voitures
ADding d3 to gemfile
updated README
Added changelog
ディレクトリ構成を変更した。
ImagePresenter::photoOfTheDay - Do not show images from future
ImagePresenter::photoOfTheDay - Fix too big images problem.
Fix: Crash in User::gallery
Comment out deprecated session_register function.
Comment out deprecated session_unregister function.
Move limit to number of queries without reporting from 50 -> 100
Fix: Undefined variable use
Change admin section setup. Use common initialiation of Nette & DB with front-end.
Remove reference to unused file.
Remove reference to unused file.
Genera reporte2
Merge branch 'master' of https://github.com/brass3a4/idheas
[brian2] Fix/suppress a number of pylint warnings
[brian2] equations: fix test for circular static equations
Simplify HTML for menu, and add Home button.
getting up to date, canvas, Shell, ServerList
- different ways of image upload (ugly)
generalise location retrieval (includes bug 38924)

there are 3 obvious places for a user to provide their location
1) from use my current location
2) from wanting to sort the results list to show monuments closest to them
3) from clicking the locate me button on the map

creates a getPosition function in app.js which generalises location retrieval
enables the distance button (although disabled) with extra handling when first
clicked to find
hide distance calculation for monuments further than 200km away

it's not helping anyone :-)
Merge pull request #175 from jdlrobson/gettingLocation-38924

Getting location 38924
undo parentheses damage introduced in e164a8f5d06186360ecab76a07357772cbb00c27

unrelated change (due to a bad merge) seems to have been made here
Merge branch 'master' into upload-select
Initial stab at batch upload.

Things to fix:
* error handling needs to be refactored and used in both upload paths
* progress dialog should be extended to show which image you're on
* double-check that newly completed upload records are correct!
* possibly a sensible display after the upload