labofsahil/github-event-dataset-2012 huggingface dataset:
Supplies Form
Tabs
fixing MNH form
Merge branch 'master' of https://github.com/RufusMbugua/dcah

Conflicts:
	application/controllers/c_load.php
	application/views/format.php
	application/views/pages/inventory/index.php
	css/styles.css
edits
Completed changes on:

-> MNH form
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/controllers/c_auth.php
	application/controllers/c_load.php
	application/models/m_autocomplete.php
	application/models/m_zinc_ors_inventory.php
	application/views/index.php
	application/views/pages/inventory/index.php
	css/styles.css
Style edits
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/controllers/c_auth.php
	application/controllers/c_load.php
	application/views/pages/inventory/index.php
Rebase
Design edits
minor edits
New entities
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/controllers/c_front.php
	application/controllers/c_load.php
	application/core/MY_Controller.php
	application/views/form_mnh_editor.html
	application/views/form_zinc_ors_editor.html
	application/views/index.php
	application/views/pages/inventory/index.php
	css/form-opt.css
	css/styles.css
	js/js_ajax_load.js
More Entities
Merge pull request #5 from RufusMbugua/master

MNH Entities
Load recording framework

Basics for loading a recording in recording, cluster, and sophiaview.
Support Xcode 4.2 for Snow Leopard
llvm.org down; download src from mirror
Test suite and fix stupid formatoptions
Sort
Bad regex, and "fix" the debugger snippet to restore stderr/out.
This belongs in after
Wrong order
add explicit NETWORK section to manifest again, don't put index.html in there as the main document is a 'master' entry anyhow
allow to run jammit on Fedora 17

addressing:
+ jammit --config config/assets.yml -f
/usr/share/gems/gems/jammit-0.6.5/lib/jammit/compressor.rb:155:in `gsub': invalid byte sequence in US-ASCII (ArgumentError)
        from /usr/share/gems/gems/jammit-0.6.5/lib/jammit/compressor.rb:155:in `with_data_uris'
        from /usr/share/gems/gems/jammit-0.6.5/lib/jammit/compressor.rb:86:in `compress_css'
        from /usr/share/gems/gems/jammit-0.6.5/lib/jammit/packager.rb:76:in `pack_stylesheets'
        from /usr/share/gems/gems/jammit-0.6.5/lib/jammit/packager.rb:41:in `block in precache_all'
        from /usr/share/gems/gems/jammit-0.6.5/lib/jammit/packager.rb:38:in `each'
        from /usr/share/gems/gems/jammit-0.6.5/lib/jammit/packager.rb:38:in `precache_all'
        from /usr/share/gems/gems/jammit-0.6.5/lib/jammit.rb:137:in `package!'
        from /usr/share/gems/gems/jammit-0.6.5/lib/jammit/command_line.rb:29:in `initialize'
        from /usr/share/gems/gems/jammit-0.6.5/bin/jammit:5:in `new'
        from /usr/share/gems/gems/jammit-0.6.5/bin/jammit:5:in `<top (required)>'
        from /usr/bin/jammit:23:in `load'
        from /usr/bin/jammit:23:in `<main>'
error: Bad exit status from /var/tmp/rpm-tmp.Vz9TXI (%build)
Merge pull request #357 from xsuchy/pull-req-headpin-jammit

headpin - allow to run jammit on Fedora 17
Implement static analysis fixes.
Toying around with jquery ui.
rough UML-like sketch of the class structure

Created with Umbrello. http://uml.sourceforge.net/
Switched to document.body instead of $("body"), to avoid matching body tags included in sub-frames
Addition to last commit
Updated Tumblr's photo matching selector
a commit of deep meaning
Add CommandT to vim
Correct/incorrect answer statistic is collected during exersize and displayed in tree view
Translated Player's House Mom Text
Merge pull request #228 from Cooldudepoke/patch-4

Translated Player's House Mom Text
Manually committed from: https://github.com/Leanny/B2W2eng/commit/16eb2371ec3fe9aa4ac22d5540cc00998d5cfaf4
Mystery Gift Finished
Manually Committed changes from PikalaxALT. https://github.com/Kyohack/B2W2eng/pull/276
Fixed typo and wording!
Manually committed from: https://github.com/scream12345/B2W2ger/blob/444dc07313b90c5fef99611541889982fdd95eb2/2/0000/0043.txt
Update master
Merge pull request #183 from mafiox/patch-68

Full Translated 2/0103
Update master
Merge pull request #83 from pilladoll/patch-31

Update master
removed duplicate keys
Replaced tabs with spaces per style requirements.
p2 text
[11957] Aura 10848 should not cause UNIT_AURAFLAG_ALIVE_INVISIBLE

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11958] Add support for no-fly-zone text message

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[11959] Implement spell effect 131 - SPELL_EFFECT_PLAY_SOUND

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[mr1886] fix problem with incorrect macroprocessing in Microsoft compilers. thx to Chaplain for pointing. related to #921
[mr1887] fix very old problem with SetTemporaryUnsummonedPetNumber
[11960] Implement custom overwrite for range of some spell effects

Original idea and improved design for this by PSZ, who also implemented spells 66881 (with diffmodes)
Original patch for spells 28241, 54363 by Azerus
Also fix spell 24811

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
fix typo in 1885
Merge branch 'master' of https://github.com/mangos/mangos

Conflicts:
	src/game/Spell.cpp
	src/game/SpellAuras.cpp
[mr1888] tempfix ("gag") for problems, implemented in 11954, related to #926. awaiting solve from author.
[11961] Fix logic bug in 11954. Should fix most spells of issue #44
Merge branch 'master' of https://github.com/mangos/mangos
[mr1889] Fix handling of SPELL_AURA_ADD_TARGET_TRIGGER auras
[mr1890] ome corrects in pet reaction on commands. close #905 (need more work on PetAI)
Implement ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE_TYPE
Implement ACHIEVEMENT_CRITERIA_TYPE_PLAY_ARENA and fix TYPE_WIN_ARENA
Implement ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL
Rework ACHIEVEMENT_CRITERIA_TYPE_GET_KILLING_BLOWS
Fill achievements in ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL
Add some criterias into KILL_CREATURE
Fix ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM
Instead of calculation the total number of items in player's inventory/bank/equipment
use counter for count every new stored item.
took advantage of asset pipelining or Rails3
making rails asset pipelining work
making rails asset pipelining work
making assets pipeline work
making assets pipeline work
making asset pipeline work
making asset pipeline work
making asset pipeline work
making asset pipeline work
making asset pipeline work
making public folder work
fixed javascript
makes map icon required
Mostly non-visible changes. Added incomplete company.php and files to connect to database. Note that includes/host.php should be untracked!
Serial control changed to Ethernet control.
Fixes PM-System
more data and paper
Added ball lives & respawn timer.
Height and width added to progress bar
update
merge
merge
merge
merge
更新到 path 14(8815)
Changed programmers order
completionproposal integration
more coding and debugging, the tree is not working??
﻿Все настройки сведены в один файл config.py.
Файлы colors.py и keys.py удалены.
Merge branch 'master' of https://github.com/Mintormo/Kwinta
media library: avoid empty listings after an update/refresh by going one level up in the hierarchy
Merge pull request #1642 from Montellese/avoid_empty_lists

media library: avoid empty listings after an update/refresh by going one level up in the hierarchy
add toast notification when avoiding an empty list
dateadded: add <dateadded> to <videolibrary> in as.xml

0 results in using the current datetime when adding a video. This is equivalent to the behaviour before introducing the dateadded feature.
1 results in prefering to use the files mtime (if it's valid) and only using the file's ctime if the mtime isn't valid.
2 (default) results in using the newer datetime of the file's mtime and ctime.
media library: integrate grouping by sets
Cleaned up driver to remove errors
Filled Readme

Filled Readme to test functionality of GitHub.
added MySQL connector/net copyright notice to about-dialog
A little bit more info to the abstract
api.Program: minor cleanup
fixing api.AgentVariables not to use Array
api.Program: make globals be a Scala collection not Java
api.Program: make turtlesOwn be a Scala collection not Java
api.Program: make patchesOwn and linksOwn be Scala collections not Java
make Program non-final

it was probably only ever final in the first place from some misguided
years-ago attempt to squeeze out an extra 0.0001% performance
api.Program: make interfaceGlobals a Scala collection not Java
api.Program: make breedsOwn maps hold Scala collections not Java
api.Program: minor cleanup
api.Program: for breeds, use Scala collections not Java
api.Program: make it a case class
api.Program: fix recent regressions
api.Program: cleanup (change order of arguments)
api.Program: use immutable collections
api.Program: use immutable collections
api.Program: avoid 'var'
api.Program: update comment
api.Program: clean up construction
api.Program: look ma no more vars!
api.Program: minor cleanup
add links to java download, test and troubleshooting
updated repos
updated repos
trying to fix jms include
trying to fix jms include
trying to fix jms include
I think it's good now
Ajout formulaire de test
fix travis build status in readme.md
Merge branch 'master' of github.com:NickQiZhu/dc.js
Added translations for LinkedIn.
drop using static from stages 0 and 1
add $.inArray()
Merge branch 'master' of git://github.com/madrobby/zepto
optimize tap events
Version 0.4 (141.0)
Bump version.
Merge branch 'danfuzz-pause-default' into danfuzz-pause-default-dev
Fix compile warnings on dispatch_manager eunit test
Add call to count_dispatchers in balance tests
Add api call for dispatcher queue info
Add unit tests for dispatch_manager api
Call dispatch_manager api instead of gen_server cast
Merge https://github.com/OpenACD/OpenACD
Fix compile warnings on agent_manager eunit test
Comment out failing multi-node unit tests
Add eunit test for route_list
Fix public api tests in agent_channel
Merge pull request #109 from dannaaduna/master

Clean up and add api eunit tests
opencop: Added automatic refreshing of WMS layers.
Adds new instruments to dashboard plugins

 There are 6 additional "text intruments" :
    * app.wind angle +-180° on boat axis left/right is shown as > and <, e.g. "> 135°"
    * true.wind angle +-180° on boat axis left/right is shown as > and <, eg "135° <"
    * true wind direction
    * true wind speed
    * magnetic heading (flyspray #840)
    * Air Temp (implementing MTA)
 1 graphical (dial) instruments :
    * true wind angle +-180° on boat axis + speed

 There's a bugfix for true wind direction + speed (#564)
 It also implements a workaround for the Windows bug showing Temp e.g. as "25°ÂC"
It covers a couple of flysray issues #840, parts of #632, #564, #306 (no 1),
Merge pull request #24 from tom-r/dashboard

Adds new instruments to dashboard plugins
Moved Gravis GamePad Pro mappings to Controller-Database
Fix a memory leak and a bug about an event handler being registered multiple times
[NimManager] fix boot loop, thanks 'Ralf'
openvix: build 189
[EpgSelection] fix NumberZap whiles in EPG screens.
[odinm9] disable hardware accelerated blending until driver supports it.
[epglist] fix BSOD when disabling service name in graphepg
合成通知页面，for #116
Merge branch 'feature/1p-notif' of github.com:PKUIRSA/pkuzone into feature/1p-notif

Conflicts:
	app/controllers/newss_controller.rb
	for #116
styled file edit popup
only show basename of original filename
made fileuploader enabler available to page class
moved files overview data to own class
Implemented edit

Removed tags
Update oneswarm_gwt_ui/src/edu/washington/cs/oneswarm/ui/gwt/client/i18n/OSMessages_fr_FR.properties

French Translation
added more typing to quby.core

A lot of the validation code was still using 'any' types all over the
place,
especially for the object maps.

This is now resolved with a lot of maps to hard code
the types needed.
packet manager commit
added varnish cache invalidation. (currently not configurable)
Move test source folder to integration
Add mocha for mocking/stubbing
Make test runs verbose
Move loading helpers to app.rb

This makes testing a lot easier
Move helpers test to /test/spec

Also: Lay the groundwork for the new isolated unit test system
Fix bug in flattr_url
Re-work test suite
Move finders to own module; re-work models
Fix #39
Top users and top and featured apps now cached. Closes #300

This commit moves the front page actions of getting the top users and apps,
as well as the featured ones to the util.py module in order to provide caching
mechanisms at function level. Thanks to this caching improvements, loading the
front page only causes 1 SQL query, while without it gets 21. The improvement is
really big.
Merge pull request #301 from PyBossa/issue-300-frontpage-cache

Top users and top and featured apps now cached. Closes #300
Small corretion at the signin page reported at issue #158.
Merge pull request #165 from PyBossa/issue-158

Small corretion at the signin page reported at issue #158.
New fields in App and User to support featured apps.

The User now can be admin, and an application can be featured.
PEP8 Compliant and list of featured apps.
First unit tests for the admin and featured apps. Refs #153 Refs #167 Refs #163

This commits includes several fixes:

 * The first register user is granted the admin role
 * The admin/featured endpoint is available only for admins
 * The Admin users can access this page from their User page
 * The Featured apps are integrated with JS
New fields in App and User to support featured apps.

The User now can be admin, and an application can be featured.
PEP8 Compliant and list of featured apps.
First unit tests for the admin and featured apps. Refs #153 Refs #167 Refs #163

This commits includes several fixes:

 * The first register user is granted the admin role
 * The admin/featured endpoint is available only for admins
 * The Admin users can access this page from their User page
 * The Featured apps are integrated with JS
Admin role for users and apps. Closes #153 Closes #163 Refs #167

This commit has all the unit tests for the admin endpoint. The commit
also includes a new interface for adding more users as admins via a web
interface.
Index page for admins created. Refs #153 Refs #167 Refs #163

An index page has been added with access to the the available actions. Only
admin users can access this url via their User icon in the drop-down menu.
Change admin field to Boolean type. Refs #153

The admin field had an Integer type. This commit fixes it using the Boolean one.
Merge branch 'issue-153-featured-apps' of github.com:PyBossa/pybossa into issue-153-featured-apps

Conflicts:
	alembic/versions/9341dfd1b21_admin_field_for_user.py
	pybossa/model.py
	pybossa/view/admin.py
Add CMWallpapers

Change-Id: Id79dcf6f122699fb081fb178ad07a86a7aa0b893
manifest: Add theme engine dependencies

Change-Id: Ia3a1e118c1a882c4ff6b9eaa07e517a33f03c857
manifest: Remove sample themes

They're pretty broken on ICS

Change-Id: Ibe6fe81f354004bd004d459dc938c6403ea9f55f
remove all device entries from the manifest. these will all live in local_manifest. this manifest will only be used for CM core.

Change-Id: I07f7734dfe463cfec9409b8c9830e9e4e854dc84
Add qcom mm-audio encoders

Change-Id: I8fa547b34e02bc848a11c97ed3b19dd60aac3dde
Replace Music with Apollo

Change-Id: I22d04b3ab027a974fe1872e237128a7644e4d5c9
Reintroduce Music

Change-Id: I8356524ea04f1a3f2c07250385e4308b36c49fd4
Add atheros supplicant lib

Change-Id: Ib93ead978abd72fced7ad37b97eaa379e6804198
Add GanOptimizer to manifest

Change-Id: I402976922bae44192cd300d2add206abb450bb15
OCD fix

Change-Id: Ia6e7d3f2bd9c629b2a1920c185ce1d576de8170d
Update Google sources to 4.0.4_r2.1 (IMM76L)

Change-Id: I2d08e7e2fdeef3b054c739d49fd03152f3508591
Use ping6, clang, and OpenWnn from CM repo

Change-Id: Id8787143a0662c0a532191ff45b48a8b2faefa87
Use mesa3d project from CM

Change-Id: I75174f42bbb7a457625383fa5c3c3e29b5cf20d8
add an explicit github ssh remote

Change-Id: I365727c9e32930d759e32c11456bc759630058ff
fixup private

Change-Id: I02571db25641c422cc8aa95072280a3d3c0d06df
Add alsa_sound and mm-audio projects to CM for 8960.

Change-Id: If796396d21c586c14e24d5c15302a231aa901487
Update buildbot url

It was linked to buildbot.teamdouche.net, linked it to
jenkins.cyanogenmod.com instead.

Change-Id: I2a49dc99c0ef29871b8f0dfd0023a9871dfbf02b
Get Exchange from the CM repos

Change-Id: I552a0fb5bb879f8284a447c2364971f35c0c2544
Merge "Update buildbot url" into ics
Stock cyanogenmod default.xml
Add support for ARM on "macos", which is to say iOS.

There may be a nicer way to organize this, but for now just throw
ARM iOS support in with the "macos" operating system. On ARM, we
use the GCC builtins for atomic support.
Updated Readme

Nice new readme :)
Corrected _crashName Issue.
Crash Markers.

Added Makers to crashsite in preparation for other items
Fixed Readme Error
Updated Credits
Updated Zeds/Loot system.
rm patch
Feedback voting and replies implemented.
floating stuff around
Fixed score selecting.
Fixed async submission
Virtualenv and pip requirements

Renamed old requirements.txt to dependencies.txt and created new
requirements.txt, which is a pip requirements file.
bootstrap_creator.py is for creating venv_bootstrap.py which is used to
create virtualenv with all the needed dependencies.
version of class with prototypes
minified version
changed setInterval to setTimeout, its more accurate i think
merge prototype with master
new minify file
[s1611] Fix an error with debug output for MoveFall. Thx to stfx for pointing
[s1612] Fixup recent commit :( thx for pointing
put CacheTreeEnginges in separat files
naming convention ecache->ecach

wrong but consistent
removed cache query for user model
don't evict last answered entries from tree cache

Make sure that latest entries don't get evicted from cache by older entries.
updated jQuery 1.8.1 to 1.8.3
minor layout tweaks in search form
Performance Improvements

   ALTER TABLE `users` ADD UNIQUE INDEX (`username`);
   ALTER TABLE  `categories` ADD  `thread_count` INT( 11 ) NOT NULL
removed unused style files from macnemo theme
lpcprog.c: Remove spurious carriage return (CR) characters
lpc21isp.c: Remove spurious carriage return (CR) characters
Add .gitignore
Link dynamically and use LLVM on Mac OS X
Remove CRs from lpc21isp.h and adprog.c
Enhanced error reporting
Add -printserialnumber option
Added HBaseTest with serialization implementation Kryo.
Added in-memory implementation of a ReferenceSet.

Like with FeatureSets, ReferenceSets are not abstract and there is an storage
specific implementation for keeping actual data.

ReferenceSet and FeatureSet are very alike and might be joined -- if there is
a suitable design pattern which allows to do so.
KeyboardListener (getPressedKeyboardKeys method) implemented
in CrossPlatform interface
some extension method for delegates
some more extentions
New extension methods for delegates are completed.
Merge
Добавлена функция создания учетной записи с правами администратора для автоматического запуска БОТа с разных учетных записей
- Improved view.
- Fixed address parse.
Adds some new projects.
add deconnection page
links modified
links modified
links modified
Merge branch 'master' of github.com:Shuy/Projet-XML
Change the name of the generated scripts in the SignalRJs package
- Declare js version with just major and minor.
- Fix wildcard in SignalR.Js nuspec file.
Fixing missing suppression file in utils
내 전화번호 기반으로 데이타 가져오기
Redoing first 4.3 exercises
init jellybean repo

Change-Id: Ie0d5696dc468460161113629a56d059813355041
Switch github to git instead of http
* Added final modifiers to variables in Asshat module
Optimize for dynamic data meaning instead of forcing curly braces for variables for quotes for literals
Update references to data
Ignore components folder
handle init.d separately
this works better
added .apk to the gitignore file
force $target to msm8660 till i know an alternative to get the needed value..
Element.Carousel.refresh()

For refresh the instance
Fixed so that you can choose -class- when joining
Finished message scrambling method
Adding debug mode config option.
Changed tisocketmodule to tidesocket
Clean up Spring schema reference.
Merge pull request #2 from USGS-CIDA/master

Updates from pyGDP CIDA, including test functions
contact information updated
Merge pull request #16 from jread-usgs/master

Updated contact information in pyGDP
BF+TST: preliminary class tests for MultiframeWrapper, raise WrapperErrors
providing means of getting resultset-seq w/o keywordizing column names (naming strategy hack)
provide access to connection object via connection-configurator and with-connection-configurator macro
Small TagExample improvement.
teste velasquez
Updated build xml
Add loadResources

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
fixed fit_stepwise.R
fixed fit_stepwise.R 2
llvm: Add support for casted constant integers
llvm: Handle StructLiterals
refactoring get_grid_after_move to take the move as an argument
temp commit of more test data and a better best_move implementation
[ccollins/milkman#19] MilkTruck.generators should not be shared between MilkTruck instances
fixed prototype function type mismatch for the 32 bit change
Initial commit

Adds a readme file with minor project description.

Signed-off-by: XemsDoom <moser.luca@gmail.com>
RFT: Moved MultifileUploadcontroller to FileUploadController
Merge remote-tracking branch 'origin/develop' into compat6
FIX: LazyloadingProxy is now recognized and real instance is loaded
Added a console.log check so debugging doesn't break Internet Explorer.
test specs setup
same name check without excpetion
zarafaAddOn method to get Zarafa details
core-install does not longer try to create a local repository if no tmp package directory exists
Merge pull request #11 from Zentyal/jag/installer-core-install-no-tmp-repo

core-install does not longer try to create a local repository if no tmp ...
fixing people search image heights
Created doc folder with requirements
Added rough version identifier retrieval for most supported D platforms.
SO fix.
be more responsive fixes Issue #152
recompile/update documentation
added code to create new shifts with a wizard... working
wto, 1 maj 2012, 02:49:58 CEST
fixed multiple submit event
default text active
move repo includes to upload class for #64
Fixed error response and replaced tabs w/ spaces
add host ID to STATUS_NORMAL state
update tests for 7983bc
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host

Conflicts:
	src/java/org/apache/cassandra/locator/TokenMetadata.java
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission

Conflicts:
	src/java/org/apache/cassandra/gms/VersionedValue.java
	src/java/org/apache/cassandra/service/StorageService.java
properly parse UUID in light of many tokens
add missing import
increase default bloom filter fp chance to 1%
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4393
Merge branch 'cassandra-1.1' into trunk
merge from 1.1
use data size ratio in liveRatio instead of live size : serialized throughput
patch by jbellis; reviewed by slebresne for CASSANDRA-4399
merge from 1.1
add Topology to TokenMetadata and clean up thread safety design
patch by Sam Overton; reviewed by jbellis for CASSANDRA-3881
update NTS calculateNaturalEndpoints to be O(N log N)
patch by Sam Overton; reviewed by jbellis for CASSANDRA-3881
avoid using global partitioner to estimate ranges in index sstables
patch by jbellis; reviewed by yukim for CASSANDRA-4403
Merge branch 'cassandra-1.1' into trunk
use proper partitioner for Range; patch by yukim, reviewed by jbellis for CASSANDRA-4404
3881 has been committed upstream; depending directly on trunk
Merge branch 'trunk' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host

Conflicts:
	src/java/org/apache/cassandra/locator/TokenMetadata.java
Merge remote-tracking branch 'refs/remotes/acunu/p/4121/01_support_multiple_tokens_per_host' into HEAD
Merge commit 'ea07f2642bc0d1fff803a55ff20589ef207a70a1' into p/4121/01_support_multiple_tokens_per_host
python-cql update to 1.0.10
cqlsh cql3 syntax support for double-quoted names

i.e., at least don't throw an error on seeing "" in cql text
allow cql version selection
python-cql update to 1.0.10
cqlsh cql3 syntax support for double-quoted names

i.e., at least don't throw an error on seeing "" in cql text
allow cql version selection
(CLI) properly handle quotes in create/update keyspace commands
patch by Pavel Yaskevich; reviewed by Jonathan Ellis (CASSANDRA-4129)
fix terminination of the stress.java when errors were encountered
patch by Pavel Yaskevich; reviewed by Brandon Williams for CASSANDRA-4128
merge from 1.1.0
allow short snitch names & update snitch comments
patch by jbellis; reviewed by vijay for CASSANDRA-4130
merge from 1.0
Merge branch 'cassandra-1.1.0' into cassandra-1.1
Move CF and KS validation out of thrift

patch by slebresne; reviewed by jbellis for CASSANDRA-4037
(backport from cassandra-1.1 for CASSANDRA-4093 sakes)

Conflicts:

	CHANGES.txt
	src/java/org/apache/cassandra/cql/AlterTableStatement.java
	src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
	src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
	src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
add commitlog archiving and pitr
patch by Vijay and jbellis for CASSANDRA-3690
Improve picking of comparator for composite column with CQL3

patch by slebresne; reviewed by jbellis for CASSANDRA-4093
Move CF and KS validation out of thrift

patch by slebresne; reviewed by jbellis for CASSANDRA-4037
(backport from cassandra-1.1 for CASSANDRA-4093 sakes)

Conflicts:

	CHANGES.txt
	src/java/org/apache/cassandra/cql/AlterTableStatement.java
	src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
	src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
	src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
Improve picking of comparator for composite column with CQL3

patch by slebresne; reviewed by jbellis for CASSANDRA-4093
Fix duplicate method due to merge
Add stress tool to binaries
patch by Vijay; reviewed by driftx for CASSANDRA-4103
Add stress tool to binaries
patch by Vijay; reviewed by driftx for CASSANDRA-4103
Wed Nov 14 20:02:56 CET 2012
Thu Nov 15 15:00:24 CET 2012
Sat Nov 17 14:28:55 CET 2012
Sun Nov 18 05:15:34 CET 2012
Sun Nov 18 09:57:24 CET 2012
Sun Nov 18 21:50:01 CET 2012
Mon Nov 19 08:34:53 CET 2012
Mon Nov 19 08:37:22 CET 2012
Mon Nov 19 11:03:48 CET 2012
Wed Nov 21 13:35:45 CET 2012
Wed Nov 21 19:12:20 CET 2012
Thu Nov 22 22:27:57 CET 2012
poker playContinuously until 1 player left with money
change elevation for displaying elevation gain to include the word "Gain"
change the label for displaying total active duration for week, month, and year to include the word "Active"
Configuration for ls.implicit.ly
Adding 0.4 files for ls.implicit.ly
Do not update the search result for the session in inactive tab

Thanks to Lindsay Roberts<linds.r@gmail.com> for research and patch

BUG: 301682
FIXED-IN: 4.9.0
REVIEW:105244
Small krazy fix for including header
Remove unused declartion
Fix the wrong KGuiItem in the confirmation dialog for closing window

That dialog is only about closing one Konsole window , so it should use
KStandardGuiItem::closeWindow() instead of KStandardGuiItem::quit(),
which is for quitting the whole application.
handle joins/includes correctly for pluck (Fix #5990)
adding ignored extensions
start of froth compiler, more work on froth methods
moved frothjson tests into their own file
set actions
Tweaked price and km display styles.
Restructured tree.
Added systemd plugin with aliases for systemctl commands.
Merge branch 'module/systemd' into custom
Enabled systemd module
110212:1327
ENH: add percentile_width to describe method in series and dataframe
more updates on bootstrapping
Badge reservation, purchases
Initial commit
Merge branch 'master' of github.com:akam-it/rinvent
fix for ZfcBase/Mapper/AbstractDbMapper::getSelect update
fix for ZfcBase/Mapper/AbstractDbMapper::getSelect update
Merge pull request #173 from steverhoades/master

Fix for ZfcBase/Mapper/AbstractDbMapper::getSelect update
Add composer to installation in README
Merge pull request #175 from benjaminlazarecki/patch-1

Add composer to installation in README
Added about ZfcUser\Entity\UserInterface

To prevent bogus bugs like: https://github.com/ZF-Commons/ZfcUser/issues/177
Merge pull request #178 from dhaarbrink/master

Added comment about UserInterface
hide currentComponent textbox
Updated
application/views/page
view_image.php
Fix failing test due to removing static constructor on the adats
Add error test for zookeeper
Get rid of some stuff we won't need for now
synchronization not working
adding /bin
image updating fixed?
Added yieldLeft to releases/ for testing the repo
Add ssize_t which is actually POSIX compliant.
moving useful smooth/scheme code into src dir
rewrite comments.scm using lambda calculus, now very close to being valid Smooth code
Use abosulte path for backup
added Sublime Text config
清除候選區後重新整理待選區
已選人數顯示初版
Make the age check less restrictive
Swap out -- operator

Makes the HTML parser think the enclosing conditional comment has ended.
Merge branch 'master' of github.com:alphagov/static into html-validation-fix
Merge pull request #137 from alphagov/html-validation-fix

Html validation fix
Add duplicate skiplink to hidden
Add quick sentence about usability
Point out libnvidia-tls.so-related adjustments
Uso de queryset y filter por separado en planet/views.py
Modificación en la paginación. Ahora se muestra un enlace a todas las paginas disponibles.
Eliminación de import innecesarios despues de ejecutar pyflakes
Cambios sugeridos por pylink
modificado el orden de los import
Update piuparts.NEWS about master+slave packages.
Renamed the "select" sound
remember 1
Correct mixed_profile/behav_profile issue
Fixed packages folder ignore
Adds GetProjectTables method
Add LSL syntax to vim

LSL is the langage used by Second Life Scripts
Added a way for the generator to show the options available.
Generators now use instance instead of class methods.
Be less clever about installing custom packages (a little less DRY, too).
Improved bind server and added retry queue
Replace lists with a comma-separated join
Merge pull request #1154 from dhozac/varreplace-list-join

Replace lists with a comma-separated join
Add inventory variables to hostvars.

Look up only when requested and cache the result.
Merge pull request #1260 from jhoekx/inventory-in-hostvars

Add inventory variables for hosts not in the play to hostvars.
AnsibleModule (in module_common.py) now correctly reads param values containing '='.
Merge pull request #644 from bradobro/common_fix

AnsibleModule now correctly reads param values with '"'.
make --list-hosts expand out extra vars in the hosts: field
Merge pull request #1753 from skvidal/devel

make --list-hosts expand out extra vars in the hosts: field
Fixes to documentation
Merge pull request #1264 from dagwieers/doc-fixes

Fixes to documentation
added currentFrame initialization. fixes bug requiring to click play button twice.
Merge pull request #17 from alesguzik/master

Fix for bug requiring to click play button twice.
Add target to build textLayout_rb.swc.

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/sdk/branches/release4.9@1421915 13f79535-47bb-0310-9956-ffa450edef68
roots for login
removed |
store consumer form when edit only
Pick the last / device (#826537)

When there are multiple devices mounted on /, as there can
be during a preupgrade, the last device is the one that should
match the grub.cfg entry. This was preventing preupgrade from
installing the new f17 kernel.

Related: rhbz#820340
Related: rhbz#820351
Update version to 8.12
adding functionality to the event handler to remove subscribers
Merge branch 'hotfix-0.0.45' into develop
[refactor] improve mvc context interface
[bug fix] type in web application handler
changed method WebApplication::addRequestToDIContainer to a more general addToDIContainer
[refactor] handle matching a route has been isolated and moved to its own method
[refactor] handle matching a route has been isolated and moved to its own method
adding legacy classes
[refactor] legacy component to use http input object
[bug fix] typo in web application class
[refactor] moving route processings to occur before the earlist event onReady
adding a key/value payload and tags to a route spec
Merge branch 'release-0.0.45'
When removing an inventory uploader, be sure to unbind related events.

Without this, switching to a different endpoint causes this.el to be
emptied, but the existing Backbone view is still tied to this.el's
submit form event, because the DOM element isn't removed. The fix is to
unbind events for the view and the DOM element before calling empty().
Example showing issue parses correctly. Closes #59
adding new USGS layers via rest
Notify thread message list after sent sms
Merge branch 'master' of github.com:arildwtv/awesms
Add default values for new settings.

The default values for the new settings are added to ember.conf
fully functional squaremap, fixes #8 #11
Updated path to read-only version for gh-pages to build
Added demo code
Added multi-version jQuery demo
Removed unused/unnecessary Object.create(...) shim from demo
Merge branch 'gh-pages' of github.com:asmblah/modular into gh-pages
Updated DetailsFeature with new contents; implemented image downloading and caching using existing libraries; first version of LocationContextManager (both client and server side) which can retrieve the number of checked in users
Get port number from environent variable
solarized vim + powerline
Replace delimitMate with smartinput [vim]
Add paths to PATH [zshrc]
removed socketsample app
Update deb-multimedia location
Added period to the end of the output.
Use tree html output for dir listing
Merge pull request #5 from Socketubs/master

Use tree html output for dir listing
fine tuning multi-year function
Created instance_started and instance_terminated events based on HVA node id
Split Legacy and VNet netfilter event subscriptions
Added foreign vnics to the netfilter cache
Implemented VNet security groups event queues
Implemented VM isolation and security group updates using new amqp events
Fixed a mistake in security group rules for isolation unit tests
hide db user name in error messages
Replace .git file => NEW REPO!!!

* So basically... yeah, Initial commit.
Unit2-41
MSSIR lab2 improvements
Merge branch 'master' of github.com:b-ryan/dotfiles
finally a way to check whether bash completion has run
Merge branch 'master' into work
LZMA encoder/decoder should wait for the helper thread to complete before returning control
Merge branch 'release-0.9.0' into dev
Regenerate gemspec for version 1.9.10
formatting of free options on register page
add --create
[added] glFlush calls as demanded by http://developer.apple.com/library/ios/#DOCUMENTATION/3DDrawing/Conceptual/OpenGLES_ProgrammingGuide/ImplementingaMultitasking-awareOpenGLESApplication/ImplementingaMultitasking-awareOpenGLESApplication.html#//apple_ref/doc/uid/TP40008793-CH5-SW1

git-svn-id: https://libgdx.googlecode.com/svn/trunk@4195 6c4fd544-2939-11df-bb46-9574ba5d0bfa
[fixed] issue 926. Replaced separateConvexPolygons with a new overlapConvexPolygons overload which implements the SAT.

git-svn-id: https://libgdx.googlecode.com/svn/trunk@4435 6c4fd544-2939-11df-bb46-9574ba5d0bfa
Dynamic VBO's = slow. Change from VBO to VertexArrays gained 12ms with 50 animated models.

git-svn-id: https://libgdx.googlecode.com/svn/trunk@3792 6c4fd544-2939-11df-bb46-9574ba5d0bfa
ad 的name属性又换成title了
Error_Controller
Merge pull request #12 from baixing/userpage

change ad->name to title
change Error_Controller
fixed a wee merge-related issue
fix missing GeoExplorer css resources in geonode-client
Fix a missed gen_server2 rename
[homescreen][lockscreen] px to rem
[system | statusbar] px to rem
[system | utility tray, statusbar, apps wrapper] px to rem
[Makefile] Added @2x images support for apps/ and shared/
Bug 807006 - [BB][Clock] Apply building blocks [headers]
added stereo and tape type to tapedeck~

now you can listen to stereo tapes and also change the tape type
(normal, chrome and metal)
fixed a few things
removing logging/debug statements
Downgrade of DB to SQL 2008 for IoC sample
Sublime test  4
bundle solarized by default
Update scripts/unitui.browse.js
adjust pom parent relation
added restriction that only a maximum of 500 lines of stack trace elements will be logged, to avoid excessive locking for stackoverflow exceptions
increased version number to reflect new changes
Merge pull request #5 from livingtocode/master

Adding restriction to limit number of logged strack trace lines
Fixed timestamp issue with gl2 0.9.6 by dividing loggingEvent.getTimeStamp() by a 1000 and flooring it. Made the change in the test suite as well
to make sure they pass.
increasing version number to 0.9.6 to reflect compatibility with graylog2 server
Merge pull request #8 from pstehlik/53315d0

Newmaster
Simplified RestManager with a view to moving all Service and Event related functionality out of it.
Add depends target on Makefile to get dependencies
Minor
Minor
Add test for non-joining Mongolian letters

For U+1880..U+1886 Uniscribe thinks they are non-joining.
For U+1887 Uniscribe thinks it's joining, but looks wrong to me.
Adjust Mongolian shaping

For U+1880..U+1886 Uniscribe thinks they are non-joining.
For U+1887 Uniscribe thinks it's joining, but looks wrong to me.
For now, match Uniscribe.
U+A872 PHAGS-PA SUPERFIXED LETTER RA is "Right"-Joining
Added bug no. in comment as per code review
bug fixes: changed reference to NotebookManager to BaseNotebookManager, fixed where filenbmanager was getting the notebook directory name
link to new example
updated rspec requirements
updates for #fay
[fix] ensure that all watched pages are listed in user profiles, including those coming from sub-sections with forward_notifications option
[fix] in e-mail messages, transform single xhtml tags to legacy html (e.g. <br /> --> <br>)
Added G_4NOR4.vhd.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>
Added contributor guidelines to docs/index-eng.html
Started French version of Contributor guidelines
Adding mobile touch support to Lightbox.
Added SVG detection method to the PE
Merge pull request #145 from LaurentGoderre/master

Added a SVG detection feature in the PE
Merged in Slideout fixes from #143 by @berubs.
Added a failsafe to the execute method for cases where the settings file would define incorrect plugins or an element with an wet-boew-* class does not have a matching plugin
Merge branch 'master' of github.com:wet-boew/wet-boew
Merge pull request #146 from LaurentGoderre/master

Added failsafe to the _execute method
Improved keyboard support for Lightbox.
Fixing merge conflicts.
Fixed merge conflicts.
Fixed in-page CSS not being applied to IE. Added WAI-ARIA attributes to improve screen reader support.
Merge branch 'master' of https://github.com/wet-boew/wet-boew into feature-slideout
Added French Contributor guidelines translation.
Fixed a bug INE where pe.url().source would not return an absolute URL
Merge branch 'master' of github.com:wet-boew/wet-boew
Improved screen reader support for lightbox. Merged inline examples with image/ajax examples. Added detection for inline content so no longer need to explicitly identify it. Added class='lb-item-gal' to gallery items to make it possible to have the inline content as a sibling when it has nested links.
Corrected some Lightbox examples validation errors. Added lb-inline class to hide inline content.
Changed default font for h1-h6 to sans-serif. Enabled support for links within Lightbox inline and AJAX content. Added titles to Lightbox inline and AJAX content.
Add npm as a dev dependency.
Make .jamignore ignore test-build.js and test/template/.
Use a better strict mode detect for tests.js so older versions of Node.js pass.
Bump to v0.8.0.
Reduce the size of lodash.underscore.min.js.
Lookup Test Passed. (Address fromJson)

Address => StringMap
"host" -> "127.0.0.1"
"port" -> double #####.#
去掉git就可以sass
comments added
function added to Quiz class
update docs for showButtons
Shaders yay
TileSet that defines keywords for each tile quad. Will build to allow single large tiles that span multiple small ones
Broken everything. World contains multiple regions. Loads them independently. Only one region active at a time.
volume control and sound
add demo6
Fix double-paren typo
Add address groupings RPC from the coincontrol patches.

Signed-off-by: Gregory Maxwell <greg@xiph.org>
Add txout address filtering to listunspent.

This applies on top of the coincontrol listaddressgroupings patch
and makes finding eligible outputs from the groups returned
by listaddressgroupings possible.
Change CWallet addressgrouping to use CTxDestination instead of strings.

This is cleanup for the listaddressgroupings code. Also add some
real help text.
Merge pull request #1672 from gmaxwell/filter_listunspent

Listunspent txout address filtering and listaddressgroupings
Correct version
Merge branch 'gh-pages' of github.com:bitovi/jquerypp into gh-pages
Moved the README.
Updated bootstrap to correctly find PHP executable and handle symlinked installations.
Moved the README.
Merge commit 'e53305119f606a5b2562aec5f3c87123a74c9985'

Conflicts:
	wiz
Merge 'bc829f18506c9d5fc8900c5493be49dfa5436177' - the change to wiz.php I'd made.
Added ignore file.
Updated some permissions.
Switched which flag was being used in symlink check...
+JRUBY_OPTS + LANG
Fixed bug with content listing on side bar, fixed event creation bug, added content placeholder functionality, images need to be added to content yet.
added a test script to move name,main blocks from modules
added a pca_sim module that extends svd_sim
remove name,main block from script
amended init
added function skeletons to implement
added leveling system. specified player and nonplayer
修改目录结构，增加基本算法库
New test
This is the third test.
Check environment variables instead of constants
Allow hash access from main config object
Update specs
Update readme
Version 1.1.3
fix id3v2 parser to function when unused tags are encountered (oops)
updated README.md and TODO; cosmetic changes to id3v2.go
Revise and extend F# library
- Add SML compatibility library
- Move ArraySlice to SML compatibilty library
加粗了 pluginManager.vim 相关的文字
MINOR: Punctuation fix, removed app name from template.

Signed-off-by: Sam Clements <sam@borntyping.co.uk>
Added User detail pages

+ user_detail view and template
  + detail_templates function - returns a list of
    templates to use for a given object, allowing objects
    to use a unique template.
+ show_games template tag
+ Setting in README for using the user_detail view as the
  page for a sites user profiles

Signed-off-by: Sam Clements <sam@borntyping.co.uk>
Team view and template

+ team_index and team_detail views and templates
+ get_player_or_none funtion fetches a player with the given
  arguments or returns None if no such player exists
+ game_detail template links to team_index
+ Team.get_absolute_url() given

Signed-off-by: Sam Clements <sam@borntyping.co.uk>
Show a users games on their profile page

+ user_detail view and template - Show games the user is a
  player in and games they are a moderator in.
+ user_redirect view - Redirect users to their own page

Signed-off-by: Sam Clements <sam@borntyping.co.uk>
Add ewma for day suport, add tests
Merge pull request #40 from juise/master

Add ewma for day support, add tests
removed --local option for git config; there is no such option in current version of git
clean up a bunch of tests so they pass
Support configurable block size
Add delay GPU impl
Cleaned up QOLAP form
Sign up page CSS cleanup
Added a module for making sending data easier from the bot module, this means users don't have to understand the IRC protocol to send things from their bot.
+ ‘assets/scripts/app.js’
- ‘assets/scripts/index.js’
gone
1/2 working database:)
trying to undo what i did before
Merge branch 'master' of https://github.com/bransby/digPlay.git
agregue tablas tipoDireccion y nivelEscolaridad
building the path resolver.  not working yet.
All of this stuff gets symlinked into .yadr once installed
server sensor post fix
Merge branch 'master' of https://github.com/brennon/siempre
Refactor Product-Variant association
Use constant for :class_name
Replace string with symbol in model association declaration
Use constant for :class_name (cont.)
Refactor Tracker.current to use ARel syntax
Refactor State.states_group_by_country_id
Align the scope syntax
Refactor Product#on_hand
Refactor Zone#remove_previous_default
Fix typo and refactor Zone#zoneables
Fix Heroku environments issue. Fixes #1625 - https://github.com/spree/spree/issues/1625
1.小组任务查询增加根据Jira ID来搜索的功能.
1.修改flash[:error] => flash.now[:error].
Fix for Facebook sharing on iOS 6.

Need to ask for basic permissions before we log in to write, apparently. Fun!
If we don't do this we get mysterious "error 2"s.
Cleaned up the views a bit
Use best_in_place for in-place editing
You should be able to mark a task as completed
More simplification of F4MatrixReducer and improvement to tracing output for showing matrix dimensions and number of non-zero entries in a more visual way.
Correct ownership of postgresql.conf
Stylize comments
Add a couple of aliases
parola değiştirme kısmı tamamen halledildi.
Added method Game::getAspectRatio().
Added MaterialParameter::getSampler() and updated lua bindings.
Updated SpriteBatch doxygen comments.
Fixed errors detected by static code analyzer.
Fixed bug in FileSystem for windows where gameplay-tests couldn't find the shader files.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Fixed issue where non four byte aligned textures (such as many non power of two textures) were distorted due to incorrect GL_UNPACK_ALIGNMENT.

Fixes #362
Merge pull request #378 from sgrenier/next

Texture distortion fix
Changed methods in ScriptController to pass vectors by reference instead of by value.
Fixed some warnings found by the static code analyzer.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Converted tabs to spaces.
Merge pull request #379 from bslack/next

Next
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Added comment to PhysicsRigidBody::applyForce
Added Game::isGestureRegistered(Gesture::GestureEvent evt)
Merge pull request #380 from seanpaultaylor/next

Added Game::isGestureRegistered(Gesture::GestureEvent evt)
Removes changes accidentally added during testing of gestures.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Merge pull request #381 from seanpaultaylor/next

Removes changes accidentally added during testing of gestures.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
collapsible menu in facet UI; fixed focus problem with value type filter and only 1 value; new types; presentation parser finished
Fixe warning "rake/gempackagetask is deprecated in favor of rubygems/package_task" on ruby 1.9.3 in Rakefile
Use simplecov instead of rcov
Merge pull request #13 from kaluznyo/master

Use simplecov instead of rcov
worked in eric's comments
Fixes bug on rubric articles
Added a reminder comment
Correct falsy values data not rendering
add front-frameworks (bootstrap)
gitconfig local configs
Make minutes/hours wrap around correctly.

Also account for times around midnight that roll over days/months/years.

Fixes #3242
Fix docblock
Update text in routes.php to clarify when to remove core routes.
Fix issue where including elements + extending views fails.

If you include an element before calling extend(), the parent view
will be assumed to be an element instead of a view/layout.

Fixes #3248
Add missing import that causes tests to fail in isolation.
Merge branch 'master' into 2.3

Conflicts:
	lib/Cake/View/View.php