labofsahil/github-event-dataset-2012 huggingface dataset:
started working on server browser
began to rewrite server browser and ingame menu
Merge branch 'master' of git://github.com/teeworlds/teeworlds

Conflicts:
	src/game/client/components/menus_ingame.cpp
Some graphic batching:
Speed up for displaying debugtext and envelopepreview
(This reduces the performance hit especially for the 'Show Info' mode in the editor)
fixed last commit
changed server browser
Merge branch 'master' of https://github.com/SushiTee/teeworlds
remade ingame join buttons
Merge branch 'master' of git://github.com/teeworlds/teeworlds
fixed a typo and added some missing localisation markers
gave info button a function
made overlay enterable
updated gitignore file
fixed server crash on team balance. Closes #1032
Merge remote-tracking branch 'upstream/master'
Bug: Losing render-commands if commandbuffer is full(gfx)

Problem:
If there is a new draw call, it is checked if there is enough free memory for the vertices in the databuffer but not if we have enough free space in the commandbuffer to add the command
So we lose some commands during a frame cuz the commandbuffer is full

This fixes the 2nd part of issue 1004
fixed last commit
started writing the friends browser page
Merge branch 'master' of git://github.com/teeworlds/teeworlds

Conflicts:
	src/game/client/components/menus_ingame.cpp
fixed darkened moon on dm8. #661

removed the shadow that was covering the moon in the bg and edited up a
bit.
Updated qeustions() to give correct results
Reorganised tests
Updated documentation
Updated [<- and [
Updated tests
Bumped version number; updated documentation
Add edit unplayed game link in tournaments
poprawa kodu do tworzenia podtypów

Signed-off-by: Karol <karolkorol@gmail.com>
Do away with over-clever evaluation of the range function even if its arguments are unknown.  Instead, recognise a call to the range function when rendering a for statement.
Support parsing +=
Support += of known values
Runtime +=.
PlusEquals for floats and tests missing from previous commit.
Move int and float into their own files.
Add an example that appears to demonstrate I want to understand functions where some arguments are known.
added sort by priority arg
ruby: fix Pointer assignment
scripts/lever: fix for links to cage/support
Tweak the workflow lua api: include history in output of listConstraints.
Try to reimplement the inventory monitor by falconne in lua.

For no other reason than to provide a complete example of lua
interface for a native plugin :)

TODO: paint the graph in the right pane.
Config Changes to auth & world config file gen.

files will be located in config folder in src.
Connection test added
Merge branch 'develop' of github.com:anisharp/anisharp into develop
add twelve more
Added fugitive statusline to vimrc
Merge branch 'master' of github.com:anthonyfinch/.vim
Tidy up etc
Update README.
Update internationalization file.
added version to carmen gem
Win8:Forecast: Make all function async
Win8:Forecast: Add license information, add purchase button in about page
Support apps that use DXVA.
Recognize IDirect3DSwapChain9::Present as end of frame
Fix cube map image dumping.
Fix MacOSX build w/ recent Qt due to lack of i386 arch support.
Ignore built OpenGL framework.
Basic retrace support for glXCreate/DestroyPbuffer (issue #94)
Fix retracing when glUseProgram & glUseProgramObjectARB are used inside call lists.
Handle spurious calls from wglCreateContextAttribsARB to wglCreateContext (issue #95)
Fix pickling of long integers.

shifting more than the number of bits in the type yields undefined results.
Fix diffing between blobs and null.
Fix unpickle script help.
diff: Don't use colorized line-format options when not on a tty

The color output is convenient when manually looking at the
output. But when saving output to a file, (for example, for use in the
test suite), it's useful to have a much more minimal output.
os_posix: Print complete, attempted command line when execute() fails

Previously, only argv[0] was printed which did not provide much
information to the user about why the command might have
failed. Printing the entire command line allows the user to more
easily investigate the problem.

Signed-off-by: José Fonseca <jose.r.fonseca@gmail.com>
retrace: Fix off-by-one error in detection of intersecting regions.

The upperBound functions returns the first region beyond the region
containing the given address. So, to correctly use it here, we must
give it the last valid address of the current range, which is just
less than (address + size).

Signed-off-by: José Fonseca <jose.r.fonseca@gmail.com>
Add a few more assertions.
Be clearer with the Qt requirements.
retrace: ignore glXGetSwapIntervalMESA.
retrace: Exit when Escape key is pressed on X.

Match Windows behavior.
retrace: Sleep when polling for input.

As Carl Worth identified, if the user passed the "-w" option to beable
to see the last frame of the retrace, the glretrace would enter a
busy-waiting loop, consuming as much CPU as possible.
Mention AMD CodeXL.
Use Z_BEST_SPEED on PNG compression.

Otherwise the CPU becomes a major bottleneck when dumping even a modest number of frames.
assuring that jobs are executed sequentially and not in parallel
fixed trip report form, changed integers to strings
layout is added
Replace unix-style paths with platform-specific paths when adding
mapmod paths to search paths. This should fix ticket:3759. Patch
by crabster, modified by me.
Fix menu small text alignment issues. Had to remove some explanatory
text from front menu. Changed screaming caps to sane capitalization.
Update changelog
Remove qtscript test from 'make check' for now. Closes ticket:3500.
Fix display of gateways on the map with ctrl+e in debug mode.
Add new qtscript function hackMarkTiles([label | x, y[, x2, y2]])
to mark areas on the map with a pulsing red colour. Call it without
parameters to clear all such marks.
qtscript: Misc fixes. Trigger chat event also for own messages. Reduce log spam
for unimplemented events. Do not trigger on non-area labels being trespasses on.
Fix enumArea(label) second and third parameters reading. Fix marking of
area label tiles, used wrong coordinate system.
qtscript: Add function cameraZoom(z, speed) to smoothly change camera zoom.
Remove the e3 files from project that were nuked in 1214196633ffc2a448e6b1505fec493192bfd0ef
Commanders are now loaded properly from a savegame.

Fixes #3571
Prevent (possible) array overflow
May help in debugging physfs issues, this is right when we tell the game to launch. (--debug=wz needed to show the output)
Time to release 3.1.0
Update the mac doc bundle.
Merge branch 'bugfixes'
Stats cleanup. All YES/NO and true/false turned into 1/0. Unused FOM_PARTIAL removed.
Model lines containing '0' models removed - if an entry does not have a model, do not
add a model line. weaponmodifier.ini reorganized.
qtscript: Add new event eventBeaconRemoved(from, to), which for the moment is only
called when scripts remove their beacons, since players can't.
Fix leftover cases of true/false -> 1/0 noticed by Duha on the forum.
qtscript: Research now has type RESEARCH_DATA and blips type POSITION. Closes ticket:3831.
Port structure strength modifiers to INI format.
Reorganize body-propulsion graphics INI file.
use numpy.ndarrays with dtype=float in UTPM instance
add testing to the kimura dominance/recessivity module
oggheader(3072 bytes) stored for sending listeners, who join late
Update and finish styling the about us page and all the page related to it.

Update and finish styling the about us page and all the page related to
it.
small js fix so home tab is selected by default
moved lightbox js
crash reporter: Fix process running time and memory usage stats under linux. (bug #162)
Add German translation to arx-libertatis.desktop
Dummy version of UltiSnips_FileTypeChanged()

Define a dummy version of the UltiSnips_FileTypeChanged function before
checking for python support.  If that function isn't defined, the
autocommand defined in ftdetect/UltiSnips.vim will cause an error any
time a new file is opened.  That autocommand is setup before the
function is defined, so we can't setup the autocommand only when the
function exists.
Allow suppressing warning about python support

Don't warn about missing python support if the UltiSnipsNoPythonWarning
variable is defined.  This allows users to use a common set of vim
configuration files across a range of systems, even if some of them do
not have python support compiled into vim.
Document UltiSnipsNoPythonWarning variable

As requested in SirVer/ultisnips#24
Remove obsolete comment

Change in b319569 made this comment obsolete.
Matchit support for snippet files

If the matchit (http://www.vim.org/scripts/script.php?script_id=39)
plugin is loaded, define pairs to be handled by the % key.
Matchit support + small fix by Aaron
Patch by Aaron: optionally disable warning for no Python
Remove escapes @ commas
uppdate order started, incomplete
AS7-4841 Set up periodic pings between master and slave HCs; properly handle disconnections detected by them

split up applying extensions from the rest of the model

fix ping/pong mgmt headers

don't sync deployment files if they exist

Don't bother unregistering if the channel is already closed

AS7-4841 Use separate thread pool for slave initiated management requests

Promptly fail the slave registration process if the host cannot support it
AS7-4841 Use remoting/xnio with heartbeat working.
AS7-4865 Datasource after creation is in a peculiar state\
AS7-4885 Ensure parallel boot latch is properly counted down when subsystem boot failures occur
AS7-4892 jboss-descriptor-property-replacement element is not processed properly
handle non-working pwd and grp gracefully
Remove private api flag from Apache CXF, Apache WSS4J and JBossWS CXF client modules
[AS7-4911] Allow providing WebServicesMetaData into EndpointPublishService
Am adaugat schemele cu DBN
sql, model: replace ALL the downloads VIEWs
ui_template: render Published in localtime
RenderClientAdapter: don't paint when type is PET_POPUP
Atheme 7.0.5 source
Removing extra fluff
bookmark public
added output
fixed ip
tko.autotest-db-delete-job: Try to completely remove job dir

Usually, the job tag looks like [number]-[user]/[machine].
Let's download the parent [number]-[user] parent if possible

As a result, the script won't leave empty job result
directories.

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
fix linux build command
script to back up music & photos with git-annex
add Response.headers
dont use the Parser interfaces and Request/Response instead, so that we dont need to expose internals just for tests
simplify external Lwt interface to just Request and Response
Header: expose iter and fold operations
Transfer: lift the types out of the monad, leaving only the IO ops in there
update to new Transfer encoding, and add serialisation functions
update Lwt and test cases
オーディオ再生処理を整理
クライアントのリファクタリング
サーバーのリファクタリング
add calendar and events link
assembler checked in, with a regression test like a boss, assembler supports labels
making changes to database file
Moving images to thier own folder
Updated xcode project to work with images folder
Evened out the heights of the panes
Updated getValidEventsByTimeslot with new datas
Ripped out old socket.io router.
fixed margDistSCPP.margCdf()
pre computed cdf for speed up and fixed margDistSCPP computation of prob of final bundle.
Updated readme
Merge branch 'master' of git@github.com:bane73/firebase4j.git

Conflicts:
	README
Updated readme
back up my vimrc file
Pull read and write latency values
Remove trailing whitespace
WIP: attempt at async folds
WIP: enable worker pool
WIP: add worker
WIP: remove dead code
Rewrite border drawing in `focus_node`

6ad8160fadb24e422ebb75c7ea855ff2b4f2e402 introduced a blinking border
bug under the `mon == m` circumstances, the new code tries to keep it
simple while being exhaustive.
schoenheitsanderungen und raise exceptions
Merge branch 'nao-master' of https://github.com/baudvix/roboteams into nao-master
rename update-ssh-config

brew doctor bitches about anything that ends in -config.
Enter sequences made more obvious
Added a quick comparator function to get newest messages first
delete recent-unused aliases
tsdygzsd
Checkout: crlf filter.
Checkout: fix crlf tests under win32.
Tweak some styles that didn't seem to be loading from the Bootswatch gem after precompiling, so moved those styles to the main 'application.css' and precompiled again
Restore controls.png from github
added concrete transformer class. Need to focus on testing
Fix filtering by name
Merge pull request #81 from bhumphrey/CONNECT_integration

extracted FileUtil into a submodule of soap_ui and added as a dependency...
did some clean, method names and such deprecated lots of methods but didn't remove them
get rid of DesktopServicesPriv project
fix small flaw on input filename
injector thoughts
remove exportHtml and getViewableFieldHash, and change to simpler ::exportHash
resolve merge
Merge branch 'master' of github.com:bitweaver/liberty
Added four new challenges:
   GC3XTBA - Challenge - 10 letterbox (cecton)
   GC3XT9G - Challenge - Mystery master (cecton)
   GC416K3 - Challenge - T5 (cecton)
   GC3JG2N - Distance Challenge (BenteB)
bjf-ChangeLogTypePublish.gsk v0.01, initial commit
bjf-DiscoverTB.gsk v0.02, initial commit
Updated README.md
Written by: repo-copy <repo-copy@cvs.openbsd.org>

Repo copy files
Written by: repo-copy <repo-copy@cvs.openbsd.org>

Repo copy files
Written by: repo-copy <repo-copy@cvs.openbsd.org>

Repo copy files
Written by: repo-copy <repo-copy@cvs.openbsd.org>

Repo copy files
Written by: repo-copy <repo-copy@cvs.openbsd.org>

Repo copy files
Written by: joshua stein <jcs@openbsd.org>

update iwn-6030 firmware file, not used by any iwn(4) devices (yet)

use license from this new iwlwifi-6000g2b package since it has the
newest copyright year (but no other text changes)

ok sthen@
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Update to bacula-web-5.2.10.
Written by: Stuart Henderson <sthen@openbsd.org>

Add a WANTLIB on lensfun, so the LIB_DEPENDS=graphics/lensfun is actually used.
Problem reported by halex.
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Update to gstreamer1-0.11.94.
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Update to gstreamer1-plugins-base-0.11.94.
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Update to gstreamer1-plugins-good-0.11.94.
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Update to gstreamer1-plugins-bad-0.11.94.
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Update to gstreamer1-plugins-ugly-0.11.94.
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Update to bacula-5.2.11.

ok sthen@
Written by: Stuart Henderson <sthen@openbsd.org>

update to darktable 1.0.5
Written by: Stuart Henderson <sthen@openbsd.org>

missing wantlib and add a comment about lensfun so nobody mistakenly
removes it in a wantlib sync.
Written by: Jasper Lievisse Adriaanse <jasper@openbsd.org>

- update to 2.1.1
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Update to  cantarell-fonts-0.0.10.
Written by: Jasper Lievisse Adriaanse <jasper@openbsd.org>

- enable libssh2 as a transport layer
Written by: Antoine Jacoutot <ajacoutot@openbsd.org>

Fix RUN_DEPENDS.
versiton
Don't sacrifice (that little bit of) performance for (seemingly) concise code...
Only use Unicode.downcase where needed.
lib/lingo/attendee.rb: Skip any reporting unless requested.
lib/lingo/attendee/multi_worder.rb (check_multiword_key): Minimize work done in loop.
lib/lingo/database/sdbm_store.rb (_set): [FIX] Bytewise operation required.
Made WordForm (and all its descendants) "immutable".
v1.8.3
Revert "Some change in add/view rame"

This reverts commit 9c224a89228d985f4fc63771f8d8a2543060cf35.
Changed the incorrect label of Patient ID

Changed the incorrect label and got rid of the border that looked old
fashioned. Added some BR to make the lay out look nicer.

Added a label REMARK for the referral specialist to add exptra remarks.
referral changes
setValues returns a map of VALUE/ITEM pairs now
adding getCommentCount() to contentRenderer as a helper method
Merge branch 'bootstrap' of github.com:stevewithington/MuraCMS into bootstrap
Revert "adding getCommentCount() to contentRenderer as a helper method"

This reverts commit 1a37bb68dcf4deb9b22a2414097aab4b66721fc2.
adding config.xml.cfm to merced theme with ability to create mobile options
Merge pull request #488 from stevewithington/bootstrap

adding config.xml.cfm to merced theme
Working on onMissingTemplate handling
Working on onMissingTemplate handling
changed output in class Hello
changed output in class Hello UUUUUCKZ
changed output in class Hello UUUUUCKZSSSSSXXX
added python highlight
Updating gnash. I'm not sure it builds... it takes a lot of time to build; at
least it does not fail very early.



git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@33635 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
Updated Haskell packages.

 - clientsession: updated to version 0.7.4.3
 - data-default: updated to version 0.4.0
 - hoogle: updated to version 4.2.11
 - pandoc: updated to version 1.9.2
 - yesod-core: updated to version 1.0.0.1
 - yesod-form: updated to version 1.0.0.1
 - yesod-static: updated to version 1.0.0.1

git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@33636 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
dropped obsolete file

git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@33637 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
Remove lowPrio to ocaml-3.12.1

git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@33192 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
Patching python-virtualenv so that it doesn't fail if the python version is specified, e.g. --python=python2.7, and now iff the python version is specified it successfully also installs additional libs such as readline into the virtualenv

git-svn-id: https://nixos.org/repos/nix/nixpkgs/trunk@34184 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
Improved the js 'slugify'.
Improved uploader. Added dropzone, alignment issues..
Only get taxonomies for taxonomytypes that actually (still) exist..
Close logs on exit
Removed @ from log file names
Rebranded v0.8.0 to v0.8
js: log: rename runs to builds
bug fixes, tabs, spaces, version 0.0.6
adding css, zoom, and rotate improvements
tabs and spaces
adding make scripts with versioned targets
comments, conflict resolution for hashing, improved error messages from 403 and 404
testing
update version to 0.0.7
Replace all env vars in standalone.xml.
Add custom module path to JBoss AS.
Updating gem versions
Automatic commit of package [cartridge-haproxy-1.4] release [0.11.6-1].
Automatic commit of package [rubygem-stickshift-node] release [0.12.7-1].
Automatic commit of package [cartridge-mysql-5.1] release [0.28.6-1].
Automatic commit of package [cartridge-mongodb-2.0] release [0.21.5-1].
Automatic commit of package [cartridge-php-5.3] release [0.94.4-1].
Automatic commit of package [cartridge-ruby-1.8] release [0.94.3-1].
Automatic commit of package [cartridge-ruby-1.9] release [0.1.5-1].
Automatic commit of package [rubygem-stickshift-controller] release [0.12.10-1].
add Requires: lsof to jboss spec
Merge pull request #145 from brenton/master

Missing Requires for the jboss cartridges
Merge pull request #124 from matejonnet/dev/mlazar/update/jboss_add_custom_module_dir

jboss add custom module dir
merged Replace all env vars in standalone.xml
Fix for BZ 831097
fix for bug#832745 and bug#833376
Install initial ROOT.war into app-root during configure

The initial ROOT.war should be deployed in a manner consistent with
the user build/deployment workflow to enable deploy.sh calls during
scaling to function correctly. In addition to copying ROOT.war to the
live JBoss deployments directory, copy it to the app-root deployments
directory. Otherwise, rsync calls invoked from the deploy script will
purge the live deployments directory to match the empty app-root
deployments directory.

This resolves the following bug:

- https://bugzilla.redhat.com/show_bug.cgi?id=833213
Merge pull request #148 from mrunalp/master

Fix for BZ 831097
Merge pull request #147 from rajatchopra/master

Dont barf if mongo save fails
removing .DS_Store files and adding a .gitignore
Removed the button disabling feature due to complications
new version without constant folding bugs
fix regexps parsing and update cheats
Separate Partner (public) and Entity (admin-only) pages
Fix tests after 82430c when using older versions SQLAlchemy.

Use an object that implements the PoolListener interface to listen
for the connect event when using SQLAlchemy prior to 0.7.

This also moves the registration of the event listener ahead of the
changing of the journal mode to ensure that the database connection
that SQLAlchemy spins up when executing the journal mode pragma also
triggers the event listener, and doesn't miss out on having
checkpoint_fullfsync disabled.
Merge branch 'fix-bug-2256-fallout' of git://github.com/bdash/buildbot

* 'fix-bug-2256-fallout' of git://github.com/bdash/buildbot:
  Fix tests after 82430c when using older versions SQLAlchemy.
Fix nondeterministic buildout.txt test failure

If the test happened to write to mkdir.py twice in the same second,
Python's import cache wouldn't notice that the .pyc file is stale and
would execute old code.
Merge pull request #10 from mgedmin/fix-buildout.txt

Fix nondeterministic buildout.txt test failure
Address Adapter
add arena unit tests, include title in tests
commit
mensage
algo
algo
minor corrections in report, mainly spelling errors
Added some testing events. One of them should be removed before the demo.
made WEEZING
added support for ephemeral sockets (heavy load protection - see sivy/node-statsd#8 ), minor formatting changes, port and host params now have default values
修正右聊天框内嵌插件不跟随右聊天框尺寸变更的BUG.
修正内置CD一处LUA错误.

Signed-off-by: cadcamzy <cadcamzy@hotmail.com>
In case of synonym cycles, destroy all associated Synonym records
Change {name 137004} to Nomen nudum
If nomen nudum was in brackets, make the taxon valid
Utility for showing nomen nudums and their histories
Species#become_subspecies_of
Data fixes
Tweaked level 4
Added support for blue ball
Fixed merge conflict
added option to admin page for deleting unused shared objects
fixed filename
fix for gco:Result containing any data
fix for search by revision
remove localization of normal users
add: button view
Merge branch 'develop' of github.com:capensis/canopsis into develop
add: d&d
Improve the README file
Merge branch 'altREADME'
Update JSAV to version 0.5.0-40, update the logo.
revise the alias' path
Remove #-macros -- work in progress
Fix login failures
simplificados formularios com o uso de opcoes do formtastic
refactoring: eliminados hacks de javascript + simplificacao do codigo
lição do dia: não esqueça do `git add`
gems atualizadas
refactoring: requerimento renomeado para processo
Updated COPY test
First success with MERGE.

Merge appears to work with some of the old tests (matmult, parallel
sort). The code is a little messy. The next steps are cleaning up the
API and making a nice way to integrate the C library with the libdeterm
library.
r4hg34g34g
dfghsdfh
added gitingore
actually added gitingore
actually added gitingore
Added vim command that will html-ize the current buffer.
remove .htaccess from git
add native locale support

* the default locale is `en-US`. you can override this in your
config/app.cfm by using set(locale='')

* locales are defined in json format. they are located in the
wheels/locales directory.

* you can access the locale in your app by using the l() method. the
l() method can also override the default locale by passing in the
option `locale` argument.
review Part 1.1 -> Score d'une position
Revert "deleted unnecessary file"

This reverts commit 876240aac056393087c2957d1f33529cfb0c1825.
more tests (many failing) for aspects as ABCs
Removed hint to the “stable” version, it does not make sense to draw people to it.
whoops, dependencies missing
Clear output sheet, add heading before data
Save system clipboards on exit
Merge remote-tracking branch 'origin/master'
fix for hivemind times, maybe
bugfix
excise main menu items.
AMR data structure updates
add blog address.
批次選取介面修改。
批次選取介面修改。
change the note, from testarea to input text.
modify bug, and add .
finch the add, del of record.
add mysql_close().
yaranullin/run_server.py: listen for incoming connections
yaranullin/run_client.py: try to connect on startup
yaranullin/main.py: catch KeyboardInterrupt
yaranullin/network/base.py. use logging

 * use LOGGER=logging.getLogger(__name__);

 * overwrite asyncore.dispatcher.log_info to use logging;

 * add debug message when the socket connects and disconnets.
yaranullin/network/base.py: fix EndPoint.__init__

 * EndPoint.__init__ must call parent class _EndPoint.__init__ with
   arguments sock and sockets.
yaranullin/network/base.py fix overwrite of state

Use 'state_msg' instead of 'state' because the latter is used in the
underlying handle_read() function.
yaranullin/network/client.py: use logging

Use LOGGER = logging.getLogger(__name__)
yaranullin/network/server.py: use logging
yaranullin/network/server.py: Eventserver -> Server
yaranullin/network/server.py: overwrite log_info

Use logging inside Server.log_info.
hebelegubele
more alsa
更新一点东西
Starter files for new directories.
main/open-vm-tools: disable because of rpc issues
Fix https://github.com/mojombo/grit/issues/41 using suggestion from msgerbush.
got something messed up, re-init project
simplified checkmated assertion in build-tree function
Merge branch 'release/fred/hadoop-os-build' into release/fred/hadoop-build
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge branch 'release/fred/hadoop-os-build' into release/fred/hadoop-build
Merge remote-tracking branch 'dell/release/fred/hadoop-build' into release/fred/hadoop-build
Add updated submodule references for release/fred/master
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge pull request #1529 from galthaus/pull-req-release-fred-master-9589193ae8

Minor deployer tweak and merge in EQLX driver [3/6]
Merge pull request #1532 from galthaus/pull-req-release-fred-hadoop-os-build-d36fe53e69

Minor deployer tweak and merge in EQLX driver [6/6]
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge branch 'release/fred/hadoop-os-build' into release/fred/hadoop-build
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge branch 'release/fred/hadoop-os-build' into release/fred/hadoop-build
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge branch 'release/fred/hadoop-os-build' into release/fred/hadoop-build
Merge remote-tracking branch 'dell/release/fred/hadoop-build' into release/fred/hadoop-build
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge branch 'release/fred/hadoop-os-build' into release/fred/hadoop-build
Merge branch 'release/fred/master' into release/fred/hadoop-os-build
Merge branch 'release/fred/hadoop-os-build' into release/fred/hadoop-build
Add init db migration for warden CPI

Change-Id: I642235b8c06589a7a175d1a84ae3448e963d05ea
wrong image_id path in micro_bosh.yml

Change-Id: Iccaa73d79862f1cacf8873ac9f6a16ad68be6a0c
Merge "wrong image_id path in micro_bosh.yml"
deployer should use err() to raise exceptions

- and it should let stderr be stderr

Change-Id: Ic31cc615e35a910128a8ab8448a704593207d5e9
deployer version 1.0.1

- fix srderr redirect bug

Change-Id: I034b7cd5241e038ba339f1c4ea72d863deee1f8f
Merge "deployer should use err() to raise exceptions"
Merge "deployer version 1.0.1"
Check if stemcell exists before attempting to delete

DRY up specs

Change-Id: Ic1f45b01365f1d0f3777da59ce0ebfb303bb17ba
Merge "Check if stemcell exists before attempting to delete"
Add a test for new initialize and finalize functionality.
Fix number of jobs to 2 for kernel modules to avoid build failure
update for msvc2010
fixed memory leak from CCGLProgram.cpp
enable retina for win32
retina for win32
fixed content size issue for retina
add pixel format I8
fixed getContentSize pass by reference issue
update project setting for release mode
add project for iOS
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20

Conflicts:
	cocos2dx/include/CCTexture2D.h
	cocos2dx/include/ccMacros.h
	cocos2dx/textures/CCTexture2D.cpp
	lua/cocos2dx_support/LuaCocos2d.cpp
Merge branch 'gles20' of https://github.com/jbyu/cocos2d-x into gles20
fixed #1165: Close retinaDisplay for HelloWorld by default. Removed ENABLE_ALL_SHADER macro. Fixed some issues in CCSprite.cpp.
Merge pull request #843 from dumganhar/iss1165_gles20_jbyu

fixed #1165: merged pull request 842
add project for ios
fixed memory leak in CCGLProgram
add pixel format I8 in CCTexture2D
update Director.pkg for LuaCocos2d
fix doxygen rendering output of CCLayerGradient

Otherwise, the first line of CCLayerGradient is rendered with a box in
doxygen's output.
fix the doxygen warnings

cocos2d-x.git/extensions/network/HttpClient.h:64: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForConnect(int value) are not documented:
  parameter 'value'
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: argument 'timeout' of command @param is not found in the argument list of CCHttpClient::setTimeoutForRead(int value)
cocos2d-x.git/extensions/network/HttpClient.h:79: warning: The following parameters of cocos2d::extension::CCHttpClient::setTimeoutForRead(int value) are not documented:
  parameter 'value'
Merge pull request #1647 from guanqun/fix-doxygen

Fix doxygen related errors and warnings
adapted probing for win7
Merge pull request #2 from ChristophPrybila/master

Windows 7 woes
wholesale block update css
Allows apostrophe (and single quote, since this is often used in lieu) in author name. 
Merge pull request #548 from pocallaghan/master

Allows apostrophe in author name
Did some cleanup to how submissions are rendered in browse content
Checking for configs table in initializer before trying to insert
add text for non-leaders.  There's probably a cleaner way to do this
Fixed an alias of git commands.
fixed the fucked up navbar ... missing doctype (weird error)
corosync to start in infiniband + redundant ring active/passive mode

Corosync now works with infiniband transport in any redundant ring mode

Signed-off-by: Evgeny Barskiy <barskiy@rts.ru>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Update .gitignore files

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

       compile
       init/corosync
       init/corosync-notifyd
       test/ploadstart

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
totemcrypto: implement crypto packet format 2.2 and crypto_compat: config opt

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Fix handling of NULL parameters in cmap

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Fix problem with sync operations under very rare circumstances

This patch creates a special message queue for synchronization messages.
This prevents a situation in which messages are queued in the
new_message_queue but have not yet been originated from corrupting the
synchronization process.

Signed-off-by: Steven Dake <sdake@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Handle segfault in backlog_get

If instance->memb_state is not OPERATION or RECOVERY, we was passing NULL
to cs_queue_used call.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Add waiting_trans_ack also to fragmentation layer

Patch for support waiting_trans_ack may fail if there is synchronization
happening between delivery of fragmented message. In such situation,
fragmentation layer is waiting for message with correct number, but it
will never arrive.

Solution is to handle (callback) change of waiting_trans_ack and use
different queue.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>
totemip: insert items in correct order

list_add_tail is used instead of list_add so ip addresses are inserted
in same order as returned by getifaddrs.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>
totemip: Support bind to exact address

Logic for binding now works in following way:
- Try to find exact match
- If not exact match is found, use first found network address

This allows set concrete IP even if network settings contains two IPs on
same network.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>
man: corosync.conf seqno_unchanged_const description incorrect

seqno_unchanged_const is used to determine when the rep should hold the
token. The merge detection timeout is started after any idle rotation of
the token.

Signed-off-by: Tim Beale <tlbeale@gmail.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Remove unused structure

Nowhere in the corosync codebase references this structure.

Signed-off-by: Tim Beale <tlbeale@gmail.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
sa-confdb: fix crash due to incorrect malloc size

with recent changes, confdb and saconfdb were allocating two different
sizes for the same results. While on x86_64 this was masked nicely,
on i686 it causes crashes.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
aesthetic touches on Main.hs
Merge branch 'master' of github.com:corsis/PortFusion
Doing some Malta coding action - added change password screen
added an overlay
added check to playGame which checks whether the thread is already running or not
adding index.html
Some modimications
adding a verification method for sig0 signed packets
[natpanch] minor fixes in sp server code
ad
Add SelectiveColor class
Add getPhoto method to Container class
Add getContainer method to Photo class
Delete Photo completed
Delete Group/SC completed
Connect/Disconnect photo from group: finish selection, waiting for last
step: persists the changes
Major changes and restructure PhotoListActivity
Merge branch 'master' into Skroman
Added remaining user properties
Merge pull request #1 from mhirth/master

Added remaining user properties
Fix incorrectly-cased filename.
Switch to Leaflet.draw, which is better :)
All kind of fixes. Start adding JSP/JSTL support
Welcome, home !
Serve static resources
Initial start of web frontend with drawable map (still many things to
improve)
Start adding war and stuff for standalone with-jetty mode
Updates to dwm and .bashrc.
scala-modeをelpaのものにのせかえ
elscreen系削除
navi2ch削除
psvn削除
add navi2ch as submodule
twittering-modeなぞ入れてみた
evernote-modeを入れてみた（ただし使いこなせない）
Here
Flame
Flamethrower is Ready!
Merge remote-tracking branch 'origin/Nathan' into cdub
Merge Nathan into cdub
Merge remote-tracking branch 'origin/Andrew' into cdub

Conflicts:
	Shooter.Game/Shooter.Game/Shooter.Game/ShooterGame.cs
	Shooter.Game/Shooter.Gameplay/Weapons/Crossbow.cs
	Shooter.Game/Shooter.Gameplay/Weapons/Fireable.cs
	Shooter.Game/Shooter.Gameplay/Weapons/IFireable.cs
ignore packages
deleted packages
ignore packages
remove packages
Merge remote-tracking branch 'origin/Nathan' into cdub
Merge remote-tracking branch 'origin/Andrew' into cdub
Weapons integration
Merge remote-tracking branch 'origin/Nathan'
Merge remote-tracking branch 'origin/cdub'
Merge remote-tracking branch 'origin/master' into Nathan
d
Merge branch 'master' of github.com:cxjj2011/cxjj2011
first 2.0.6 push: Czech language files, responsive searchbar fix
Using nconf for configuration.

Instead of our home-brewed format.
Update inc/postlist_config.php

no_cache added
add subscribtion for each change event.
reversed returns
RunChange

I am not going to take the time to explain in depth what I have done
each time.
RunChange
add Script, Topez, and Smalltalk leaf nodes ... pick some colors
Added extended support of prefixed method to test DOM properties too
Used changes to prefixed method to alter indexedDB test to use it
Removed x char from script src.
Drop the console call
Merge branch 'prefixed' of github.com:Modernizr/Modernizr into prefixed
csstransforms3d fix for chrome win xp w/o 3d acceleration.

we hit a false positive on csstransforms3d when a client had chrome
installed on an older machine without 3d acceleration. huge thanks to
desandro.
html5shiv v3.1. added. fixes #426
remove duplicate notifications test.
Changed prefixed method to return live object and added third arg to bind to
Updated tests for prefixed changes
Drop the bind shim comments
removed dependencies from other test
Merge pull request #482 from danbeam/master

Add feature detect for Web Intents
Merge branch 'master' of github.com:Modernizr/Modernizr

* 'master' of github.com:Modernizr/Modernizr:
  adding web intents feature detect
new html5shiv v3.2 fixes issue #426
replaced nb-space with space
copyright update. uncessary year.
Merge branch 'prefixed' of github.com:Modernizr/Modernizr into prefixed

* 'prefixed' of github.com:Modernizr/Modernizr:
  Drop the bind shim comments
  Updated tests for prefixed changes
  Changed prefixed method to return live object and added third arg to bind to
  Drop the console call
  Removed x char from script src.
  Used changes to prefixed method to alter indexedDB test to use it
  Added extended support of prefixed method to test DOM properties too
Merge pull request #462 from drewcovi/csstransforms3d_fix

csstransforms3d fix for chrome win xp w/o 3d acceleration.
Merge branch 'master' of github.com:Modernizr/Modernizr

* 'master' of github.com:Modernizr/Modernizr:
  csstransforms3d fix for chrome win xp w/o 3d acceleration.
It's a new beginning for the project!
Cleand up almost everything. Changed the hardware (now uses peak
detector).
Deleted useless file
Inserido script kern_exec.d
Insercao da descricao do script kern_exec.d no arquivo README.md
Fix bug with UAT data not completely resetting before scenario.
Replace more native webdriver methods with retry extensions.
login facebook agregado
issue #14: minor  refactoring
DIY: Added some debugging logging
Restructure directories to be more consistent, create a different setupWonderWorkspace.sh for Git builds since they are quite different from SVN builds.
Modify the WONDER_BRANCH_DIRECTORY variable assignment
Merge pull request #2 from amagavi/master

Bug fix 
Change variable to match Jenkins job config
Add submodule for InstallWOAndWonder job so it can be maintained separately from WOJenkins job and the Jenkins job directory can be used as the actual local clone of the GitHub repository.
Revert "Add submodule for InstallWOAndWonder job so it can be maintained separately from WOJenkins job and the Jenkins job directory can be used as the actual local clone of the GitHub repository."

This reverts commit fb9ff0539eb4c002d097f22292b21f7352748760.
Make the submodule directory relative.
Rearrange some directories and add a submodule for the WOnder-Based_WOProject Jenkins build job definition
Add support for git wonder / svn project build script
Fix woproject.jar download url to point to wolips37current build.
Change BRANCHES_TAGS_TRUNK variable name to PROJECTS_BRANCHES_TAGS_TRUNK
Update submodules
remove orphan submodule ref
Get rid of submodules alltogether.
Add job definition that will allow easy cloning of other Job Definitions
move script into sub directory
Make script fail on duplicate project name.
Add logic to build script to allow renaming an application at build time and greatly improve code by using variables and more comments
add full executable path for git in case the Jenkins user doesn't have a shortcut setup.
surround git command with parenthesis
Update html.vim
added driver, k-means code, and sepc code files
ADD: new project StorageJDBCDemo
If I was one of the last players left then I'd do nothing which is kinda silly.
Fixed Docco docs, made underwear modular
adds group support to septu

Signed-off-by: Daniel Berry <daniel@berrymediagroup.com>
adds assets to admin ui

Signed-off-by: Daniel Berry <daniel@berrymediagroup.com>
fixes some bugs and removes admin ui methods

Signed-off-by: Daniel Berry <daniel@berrymediagroup.com>
removes assets and public files

Signed-off-by: Daniel Berry <daniel@berrymediagroup.com>
Merge branch 'feature/admin_ui' into develop
Decoupling localization controller
added victory screen. Fixed and added some tests.
Added the TimestampTickEngine class
Enabled the generation of collaboration diagrams.
Make fieldset legends lowercase with CSS
enhanced actor structure for aggregators
introduced project for managing data aggregation
Created actor starting structure
worked on generic aggregator actor structure
started building tests to find out what does not
work
tried to add some logging
configuration for file logging fixed. almost.
redesigned aggregation section to make simple tests work
fixed all tests. even webserver tests
refactored aggregators according to cake pattern
expanded cake pattern to web project. now debugging
more debug output
implemented oauth2.0 for stackoverflow
refactored aggregator initialization
removed some old resource files
made everything work again with test-specific aggregator implementation
rewrote all query models to support timestamps and virtual time frames
coding standards and fixes
should use retl not ret
added bootstrap reference
Tweak 2 to the home page file.
removed the need for the drain buffer.  renamed bufferPoolEntry.buf to br for clarity. (thanks bradfitz)
Issue #2 - UUID
Fixed files that were somehow borked in frameworks
Release cleanup, closes #3620

* remove un-/underused gems
* remove their associated files
* remove some parallel_tests leftovers
gem
added status message spec, fix render nothing
Add translations to /app/views/admins/_admin_bar.haml
added status message html and mobile spec
Upload en.yml for translation /app/views/admins/_admin_bar.haml
Añadida comprobación en castellano
added 3 invalid status message specs
Merge pull request #3030 from Raven24/patch-1

don't let oembed content grow beyond stream width
Merge pull request #3036 from diasp/missing-template

Added status message spec, fix render nothing
Merge pull request #3037 from movilla/master

Add translation app/views/admins/_admin_bar.haml for Admin Panel
more quick inf and more show more space
Merge remote branch 'upstream/master'
Using composer to manage Twig library
Updated Finnish translation

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
added Arturo to translators
updated translation files
make check for redis version in unit tests same as in my serialization commands branch
Add note about source steps having their own workdir when working with multiple codebases.

Addition suggested by confusion on the mailing list.
fix typos in class names
Merge branch 'patch-5' of git://github.com/benallard/buildbot
Finished assembler --- comments and outputing to file
Corrected the out file directory
Final Assembler push to git
Update monad.scm
Provide view removed buttons added to action  button and reformatting view
EC: Speedup access to event history
Merge branch 'master' of ssh://mathias-kettner.de/check_mk
performeter_temperature now returns unicode string
fixed changelog conflict

Conflicts:

	ChangeLog
output_format=json now using double quotes
remove dependency from PAManager;
add: tests;
^-- cd
Fix error reporting of failing async specs
Fixed arrayRemove() helper function

The function was broken in a way that when it actually removed an item from
the array, it would run over the end of the array, throwing an exception
trying to work with a null element. Fixed by returning directly after
deleting an element. This is OK since the method is only used for arrays
without duplicate elements.

Also added a test case that uses arrayRemove() (indirectly).
Merge pull request #88 from doo/fix_array_remove

Fixed arrayRemove() helper function
Fixed removing local (_new) objects

If an object was created, added and removed without flushing in between, it
was still persisted. Fixed by directly removing _new objects from the
trackedObjects array.
Added 'like' property filter support for SQL
Merge remote-tracking branch 'upstream/master'
Merge branch 'like_filter_operator'
Merge remote-tracking branch 'origin/local_object_removal'
sample added
sample added
sample added
examples/rmount.pl now accepts a non-standard ssh port
Moved a bit of documentation from readme into POD
Merge pull request #9 from isync/master

rmount example now accepts a non-standard ssh port; moved a bit of README into POD
Added rotation to horizontal boat positions on client side.
change to using larger header for title
Fix Product Sort
added open alias, spellings, etc
rc merge
UP-3284:  Change in favor of Jan's suggestion on pull request #67 -- a guest is someone with username=PersonFactory.GUEST_USERNAME who has not authenticated
modified init to fix HEAD issue
Enable dired-x, which provides dired-omit-mode and C-x C-j.

I (approximately) followed installation instructions at:
http://www.gnu.org/software/emacs/manual/html_node/dired-x/Installation.html
http://www.gnu.org/software/emacs/manual/html_node/dired-x/Optional-Installation-Dired-Jump.html
Implemented 'checklist' for listings of checkbox items.
Don't announce services with ttl = 0.
Add Python GI example.
improvement: Allow users to wrap the calls to the SUT. Do this by extending fitnesse.slim.fixtureInteraction.FixtureInteraction, and pass in that class name with the -i flag to the Slim Server.
test null value
Merge remote-tracking branch 'origin/master'
Updated a few problems - working on gc
add sender email to notifications
Experimenting with code completion windows
friends update
assets
friends fix
friends UI fix
like update
like update bug fix
friedns view profile focus bug fix
view friend profile ui fix
view friend profile ui fix2
view friend profile ui fix3
bugfix
buy flow update
UI/UX
gemfile
gemfile
Refactor Query.scopes

Default to an empty has if no scopes are registered.  Remove redundant
Query#_scopes method.
Add Paraphrase.query to easily instantiate queries
Should be adding self instead of the source
Fixup indentation in Paraphrase.register
Add Syntax module

Syntax module provides methods for creating query classes from within
the source class/module.
Fixup whitespace
Ensure source is set via Syntax#register_mapping

Made Paraphrase.mappings a editable externally accessible so
registering a mapping doesn't require going through Paraphrase.register.

Add Paraphrase.[]= as a shortcut for setting mappings.

Restructure Query.paraphrases to accept a class instead of a symbol or
string to retrieve the class.  In ActiveRecord, this will be autoloaded.
Elsewhere, it should be required/loaded before the query class.
Tmux auto rename window
Updating script to download configs
Checks for correct number placement and correct sudoku board as a whole

Added highlighting of all cells of the same number
Disable bottom number selector when 9 of that number are on the board
Google Analytics code
Removed ReSharper files from repository
Paginacja dentystow
README update
Merge branch 'master' of https://github.com/emadelwany/CS294A
Updating README
Merge branch 'master' of https://github.com/emadelwany/CS294A
Adding accessor and mutator for for return segment within a segment in Engine Layer
Weechat / winetricks updates; add winetricks-alpha, too
new decision tree on pf
corretto le classi per utilizzare il formato json correttamente

getMeasure l'avevo impostata per ritornare json, non un array, quindi
non funzionava la ricerca del minimo
gestione eccezioni
three consecutive frames on the same probe destination
repoman: validate PORTAGE_GPG_KEY
Went through the painful process of making it possible to compile and link the code properly.  Global variables can go DIAF...
Fixed bugs in networking, mainly a single Bits object reference being passed to each server-side client thread for handling.
try allowing all again
This time really for sure made the report config changes backwards compatible
Added 8-LED display program as well as the template for interfacing with
parallel ports.
new file:   backend/admin/user_edit.php~
	new file:   backend/admin/user_update.php
	new file:   backend/admin/user_update.php~
	new file:   backend/admin/useredit.php
	modified:   backend/admin/utenti_visualize.php
	modified:   backend/require/database.php