labofsahil/github-event-dataset-2012 huggingface dataset:
precheck is now validating permissions, harddrive space etc.
Updated test_dynamixel_controller : fix memory free
trying something for net
Merge branch 'master' of github.com:wiktr/slip-b
trying to fix net; tested code in janek folder and it works
Merge pull request #1 from wonguk/master

asdasd
Merge pull request #1 from dhavals/master

dhaval
[WIN32] fixed some issues mentioned on github
removed xbox legacy code. doubt that it'll still in use. maybe one day we can get rid of IoSupport.cpp/h
some more xbox cleanup
more xbox cleanup 2
Added a note to the android_dev_intro.rst.
Merge branch '2.4' of https://github.com/wswld/opencv into 2.4
20121225 封雅芳
xtyle.less fixes
remove old files
Merge branch 'master' into gh-pages
README.md added from master branch
Use DERIVE in AuthFailPlugin.
Add dir operate test and pack sqlite operate into cpp class with one test
A bunch of changes, also moved stuff around
Fixing issue #2492 for master branch. ActionView::Base.field_error_proc doesn't call for label.

objectify_options method should be applied to the proper options arg.

See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
Merge pull request #5499 from arunagw/remove_unused_code

removed unused variables
Revert "[ci skip] updated bin/rails code in Rails Initialization Process guide"

This reverts commit 7feec40b89ada892ca6f107ada27ceedde505d83.

Reason: The guide had the contents of railties/bin/rails and I don't see
any reason to change it.
Fix indenting in migration generator

    $ rails generate migration remove_foo_from_bars foo:string

This currently generates:

      def up
        remove_column :bars, :foo
          end

Fix it:

      def up
        remove_column :bars, :foo
      end
add missing do [ci skip]
minor edits in testing guide [ci skip]
Merge branch 'master' of github.com:lifo/docrails
attributes are cached by string keys, so to_s to support symbols. fixes #5549
adds delegetion for eof? to AD::Http::UploadedFile

if you want to read the file you may need to ask if there is something
to read from
Don't break Haml with textarea newline fix.

See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.)

Also fix 6 more tests that didn't yet have the newline expectation.
Remove Arel::Relation constant from PredicateBuilder.
Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-master

Don't break Haml with textarea newline fix. (master)
Rails.initialized? can be called at any time without raising an exception [Closes #2507]

Changes:

* `Rails.initialized=` has been removed
* `Rails.initialized?` and `Rails.application.initialized?` are now
* delegating to `MyApp::Application.initialized?`
Check if the options hash already exists and merge it with the another
hash.

Closes #2492 and #5615
remove redundant variable
Merge pull request #5621 from rafaelfranca/fix-2492-master

Fix label_tag to merge the options hash with the object hash
Merge pull request #5616 from cbartlett/migration-indent

Fix indenting in migration generator
Changed the config.assets.manifest path in the comments to nil.
Improved the comment for config.assets.manifest in the asset_pipeline guides.
Changed the config.assets.manifest to nil in the comments in the production config template.
saved before migrate
remove main_game_t type

the main_game_t data type was only inside the main_game module so all
the data is now declared there as static data.
Ported controller fixes and fixed up some tests
Correcting views_multiple_devices example.
Merge pull request #551 from zhouyaoji/docs_select_property_section

Correcting views_multiple_devices example.
Updated doxygen for ' 3ebd86e Merge branch 'master' of dev.school.yandex.net:ltr1 ' build 500
use id instead of name
left pad
read write dir allow
can delete file
create deleted files
title change/new work line
Keyword file
rewrite engine

Signed-off-by: yud1z <yud1z.dev@gmail.com>
remove pyflakes
add rainbow_parenthese syntastic vim-surround zencoding
add taglist
rainbow config
add groovy fold
Change Zazl logging config to log INFO messages
Finish the rest of stream tests
Remove assertions that convolute program logic
速度
速度
随碟附送
随碟附送
set the tag input height=40
模板分解，本地化编码。
page parser and page object
- added separated class for variables context (HopContext)
- fixed some bugs in csvdir driver
Add strings.Join to default utils
more animation options and multiple keyframes support
Adding Plain Text Test
correct TcpServer and TcpClient
Post 'Festas de fim de ano'
translations, issue #272, pep8.
Merge branch 'master' of github.com:AIFDR/inasafe
translation
Merge branch 'master' of github.com:AIFDR/inasafe
pep8
- fix some intesive cs-issus in sniff files
reduced _html module
Revert "made the body argument of PayloadAlert optional".
Not needed in the Pull Request.
aaa
bbb
Merge pull request #3 from rascher/master

ddfbdfb
skd fix
New tag
English translations
Sektor translations
New tag
Eng sorting and breaking of list
Translations for drugi pogoji
EUGO-80
En translations fixes
En translations fixes
En translations for cezmejno dovoljenje
en translations for cezmejno opravljanje poklica
en translations for dovoljenje v tujini
en translations for dovoljenje v tujini
en translation fixes
New tag
language fix for cezmejno opravljanje poklica
Pravna podlaga pri dovoljenju
pravno varstvo translation fix
Merge branch '1.3' of https://github.com/Aeris3/a3_ekt into 1.3
Update README.md
Merge pull request #52 from AliGH/newmaster

move forward
remove junk
Merge remote-tracking branch 'aligh/newmaster'
merge pedasag :(
Change Hover Mode
Khak too sare in code ha va code nevisi hash ke dahane hamaro service karde
Merge remote-tracking branch 'fork/newmaster' into newmaster
Add alt for about images
Format it

Signed-off-by: Tony Z <xl2tp@mohnatka.ru>
Scan table: updated tab counters
add the crossbuild script to the source package
use ApplicationScoped instead of Singleton where able (will use proxies
instead of direct instance, and won't enforce synchronization)
ticket 1118
ENH: improve locality of all eigenanatomy prior evecs

git-svn-id: https://advants.svn.sourceforge.net/svnroot/advants/trunk@1698 fd2da0a4-d968-48df-9cb5-d8c496287cbf
BUG: grad step not set right

git-svn-id: https://advants.svn.sourceforge.net/svnroot/advants/trunk@1699 fd2da0a4-d968-48df-9cb5-d8c496287cbf
ENH: cleaning up printing to screen 

git-svn-id: https://advants.svn.sourceforge.net/svnroot/advants/trunk@1700 fd2da0a4-d968-48df-9cb5-d8c496287cbf
ENH:  Updating ITK git tag.

git-svn-id: https://advants.svn.sourceforge.net/svnroot/advants/trunk@1701 fd2da0a4-d968-48df-9cb5-d8c496287cbf
Update test/tools/build_run.xml

修改build_run.xml
Merge branch 'dev'

Conflicts:
	test/tools/build_run.xml
Merge pull request #220 from Robinlim/master

[demo]修改demo
[testcase]微调框架release模式
[testcase]修改$button的用例，dialog.css的路径通过upath获取
Merge pull request #182 from tianlili/dev

Dev
Merge branch 'master' of https://github.com/Baldrs/valama

Conflicts:
	CMakeLists.txt
	src/main.vala
Merge branch 'master' of https://github.com/Baldrs/valama
Say, not send. Dummy.
[bug 854152] make sure we don't have newlines in base64 auth encoding
Automatic commit of package [rhc] release [0.98.8-1].
rhc version.rb bump
use version paths to call the correct base64 method
fix tests by setting the correct user agent
ruby 1.8 still requires us to strip off the last \n for b64encode
Merge pull request #148 from J5/bugfix

Merged by openshift-bot
Fix BZ829919: Look up defined OpenShift user name before prompting the user for it.

Still failing one spec.
Made the map bigger, added a battle background
Chapter 1, section 2.
implemented actors detail view and fixed actor links
Finished translations, cleaned up Japanese crap in various areas. (such as around Pokedex Count and Money)
#13 EvaluationBundle:AdminController:NewSectorAction prend en compte les sectors déjà définis ; suspension de la possibilité de modification des EvalSector
Float is the default precision now
Frustum culling and example
python client almost ready
Fix Safari 6 issue when setting .corner attribute
Merge branch 'master' of git://github.com/DC2012/DC2012
fixed Tyler's code so that they compile on Anthony's comp
menu and connection to server finished
added files to client, fixed all tile compilation errors
refactored tile class
Merge pull request #6 from chrissim/master

do it now
!WIP [logos] replace static file level class storage with lookup functions.
!WIP remove staticclassgroup->initializers, because it should be blanked.
!WIP add Group->initRequired, which tells whether a group must be initialized.
!WIP do not attempt to initialize the staticClassGroup anywhere: it no longer requires it.
!WIP only complain about non-initialized groups that require initialization (have classes) instead of explicit groups that are not initialized.
!WIP Generate a constructor for all non-explicit init-required groups. Do not generate a constructor if no groups match this criterion.
!WIP include logos/logos.h in the preamble. Aggregate preamble text. logos.h is currently blank.
!WIP add LOGOS_INLINE to logos.h and use it for static class functions.
added some caching rules
Fix and properly test Matcher.find
MOTHERSHIP: More input validation for schedule.jade

It can't do really any context input validation aside from what's built into
the node-schedule library (i.e. it's possible in some cases to enter values
that reside in the past, and they'll be accepted) but the alphabet used
to populate the fields has been restricted to sane values
MOTHERSHIP: Change order for functions setting up top panel selectors

By putting these at the end of the now.ready call, some of the timing issues
with page loading are alleviated
git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@1 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@2 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@3 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@4 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@5 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@6 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@8 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@9 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@10 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@11 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@12 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@13 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@14 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@16 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@17 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2
!!! ACHTUNG Unbedingt das Database.03.sql script vorher ausführen !!!

git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@18 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2
Object Broker umbenennen

git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@19 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2
Events bereinigen

git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@20 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@21 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2


git-svn-id: svn+ssh://dasz.at/srv/dasz/svn/Kistl@22 76cbe2a5-d633-47ad-8992-a0d0e66ffbf2
Tighten up eviction logic. Prevent a passivate exception from preventing the Mp from being removed from the container.
Release of com.dexels.navajo.server.bridged version 1.0.5
Development stream of com.dexels.navajo.server.bridged version 1.0.6
Add link to mp2013.fr on the logo
Fixes #63 - Corrects package location in windows.
More Tests

Resyncing on data error
lana: fixed fblock procfs bug

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
capystrano setup
index
- Added 127.0.0.1 as dev host
- Added new i18n property
- Removed some whitespace
- Updated
Merge branch 'master' of https://maestrofjp@github.com/Enlist/Enlist.git

Conflicts:
	public/views/activity/edit.cfm
	public/views/user/edit.cfm
rl2: return EOF on EOF

Fixes Ticket1947

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avconv: prefer user-forced input framerate when choosing output framerate
vf_hqdn3d: support 16bit colordepth
vf_hqdn3d: x86 asm

13% faster on penryn, 16% on sandybridge, 15% on bulldozer
Not simd; a compiler should have generated this, but gcc didn't.
fate: Add a single symbol Ut Video decoder test

Signed-off-by: Diego Biurrun <diego@biurrun.de>
cavs: Move data tables used in only one place to that file
cavs: Move inline functions only used in one file out of the header
cavs: convert cavsdata.h to a .c file

Defining tables in header files is ugly and prone to duplication.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
dwt: Remove unused code.
audio_frame_queue: Clean up ff_af_queue_log_state debug function

The function is debug-only, so only compile it in debug mode.
Make it static as it has no uses outside of the file.
Change av_log() to av_dlog().
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  audio_frame_queue: Clean up ff_af_queue_log_state debug function
  dwt: Remove unused code.
  cavs: convert cavsdata.h to a .c file
  cavs: Move inline functions only used in one file out of the header
  cavs: Move data tables used in only one place to that file
  fate: Add a single symbol Ut Video decoder test
  vf_hqdn3d: x86 asm
  vf_hqdn3d: support 16bit colordepth
  avconv: prefer user-forced input framerate when choosing output framerate

Conflicts:
	ffmpeg.c
	libavcodec/audio_frame_queue.c
	libavcodec/dwt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
vf_hqdn3d: avoid declaring variable in for()

This should fix compilation with gcc 2.95 and possibly others

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lets start using CentOS plus, as that's a better kernel.
More namespace errors
Correction des amis : améliorations sur les listes
actually work
Merge pull request #23 from Raynos/bug-fixes

Fix incorrect require statements.
added cabal file and Setup.hs
Fix a bug and reskin loot history.
basic property of the joystick
Display the specified backgreound end foreground for the joystick
work on creating a scene ... not good now...
add mvc3 project
fix precompiled headers usage in gpu module
Merge pull request #276 from cuda-geek:fix-precomps
Fix instability of Luv/Lab color conversions
Enable parallel CvtColorLoop for all platforms
Added safety checks; trie['foo'] now raises ValueError (there is no value associated with it), and trying to add an empty keyword raises ValueError
get into release condition (hopefull)
filled out setup.py
Added MIT license file
User documentation for the comment stuff. Updated changelist
UP-3539 Updated cas.css in overlay to fix broken layout
Merge pull request #61 from jdlich/UP-3539

UP-3539 Updated cas.css in overlay to fix broken layout
Add tests and fix errors
new update.xml
Merge branch 'MPS2.5'
fix npe inside idea plugin while reading breakpoints #MPS-16330 fixed
Merge remote branch 'origin/julia/2.5' into MPS2.5
Merge branch 'MPS2.5'
partially fix MPS-16438: apply corrected migration to our actions, regenerate
Merge remote-tracking branch 'origin/MPS2.5'
Combined the logging output to have [DeviceName]: [URL]
Fixed error on AdventureTypeTemplate
improved update switch behaviour
Create new_tree
Task 1,2 - U6
docs: update references to kegboard github repo and Arduino 1.0
Cleaned up the manpage a bit.
CMake Nightly Date Stamp
Ninja: don't pollute current dir when using gui

BUG: 13495
Merge topic 'ninja-dont-pollute-current-dir' into next

dd7130a Ninja: don't pollute current dir when using gui
17d4527 CMake Nightly Date Stamp
Ninja: also set OBJECT_DIR when compiling

BUG: 0013510
Merge topic 'ninja-compile-OBJECT_DIR' into next

188c73c Ninja: also set OBJECT_DIR when compiling
Ninja: line length
Merge topic 'ninja-dont-pollute-current-dir' into next

f3c9da2 Ninja: line length
Ninja: implicit dependency for custom command files
Merge topic 'ninja-custom-command-implicit' into next

aa2e1e9 Ninja: implicit dependency for custom command files
cmTarget: Fix style for targets set insertion

Remove a comment referencing dashboard machines.  Use our standard for
loop iteration style.
Merge topic 'generator-expression-refactor' into next

99af39d cmTarget: Fix style for targets set insertion
Aggiunto index e inserita logica metriche nel json
Debug output for hello msg
Catch exception on initial speak
Should not be any crashes with this code now.
Upgrade to ZooKeeper 3.4.5
fix work-wrapping for long "No pages loaded" announcements (mostly happens in portrait)
Merge remote-tracking branch 'origin/master'
Remove logblock proof uploading codes.
Horizon cleanups and plans.
Update, permission done
caucdf.hpp
some more global reductions
Small fix to latest bsxfun implementation

- Removed useless gather
- Corrected return type for scalar case
Call DestoyMythMainWindow() before exit, even on error exits.
Rename greedyhdeint MANGLE macro to avoid conflict with libavutil's MANGLE macro.
Make clang happy without breaking OSX builds..
Focus on the search text edit by default in MythMusic's search screen
PAYPAL_CRYPT_KEY testing

In order to get the button to show, need to reapply credentials within
ppp options.
Add button to switch between stereographic and mercator projection.
Tradotta una riga
Update controller and js, need to clean up code
Fixes #8: use project start_day property to calculate sprint dates
Sprint show: when new sprint with no task fix division by 0 for hours progress bar
Fixes #2 update progress bar and hours in box
Merge branch 'issue-2'
Line added from the TestBranch
Merge branch 'TestBranch'

Conflicts:
	NewFile1.txt
Incrementing version number
Merge pull request #137 from sagarl/1.1

Incrementing version number
Add Bristol: a range of synthesiser, electric piano and organ emulations
fix sort in lists.nix
Merge pull request #190 from MarcWeber/fixes/lists-sort

fix sort in lists.nix
version readyish to go live
Change
Nether alert, bug fixes, maintainance <£

Signed-off-by: Norbo11 <norbo11@googlemail.com>
Update YAPOG/include/YAPOG/Game/Pokemon/PokemonExperience.hpp
Implement mmap for offerer (do not work for receiver)
Report model and plots
uml diagramm fertig
ListIterable entfernt, weil es unnötig ist
dsf
Merge branch 'master' of git@github.com:PPilger/OOP-8.git
DA VIDIMO DA LI CE SE PRIKAZATI FAJL
Removes unneeded constant.
Adds semantics service.
Revert "re-write. blocking now working"

This reverts commit d8b069a9382931ebdb95c4b4faec2af63c748c8a.
Added /B/ and TURKEY
[285] Fixed an error in the characters screen, and removed some un-used things in the wowlib class.
[120] Removed online checks in the wowlibs as they are kinda pointless at the moment
Corrected Package and packagename
Added API_VERSION constant and v1.0!
Merge branch 'master' into xml_tag_bug_1229
QI-363 Removed Activatable from the RDF Library
QI-363 Removed Activatable from the ReST Library
QI-364 Removed Activatable from the Scheduler Library
QI-364 Removed Activatable from the ShiroCore Library
QI-364 Removed Activatable from the UoWFile Library
QI-364 Removed Activatable from the SQL Library
Revert "i think is better place for update active_realm_id. Need testing!"

This reverts commit 8014b559d5d9444cf153d3d025164122ba03d3da.
more into LFG
return to standard mangos icon
define SPELL_ATTR_EX3_TARGET_ONLY_PLAYER and use it!

Big Thx to Schmoozerd
https://github.com/wow4you/mangos/commit/d679c679f2ee7c1fc4a853ca65c0989985a8b2cc

( Fix a lot of aoe spells with should only hit players, like 63342, 28089)
maybe we should implement addtional code in SpellCastResult Spell::CheckCast(bool strict)
Update gitconfig and submodules
Fix issue #643: yeoman build not updating revved image references in css
update riv_todo
1028 for文
1112 JFrame
User model - asynchronus login/logout + fixed bootstrap
Modifications du design des citations afin de mieux les différencier
Fix sbcast's credential to last till the end of a job instead of the
previous 20 minute time limit.  The previous behavior would fail for
large files 20 minutes into the transfer.
Add HWLOC_FLAGS so linking to libslurm works correctly
Improve reason information for job not schedulable due to busy nodes

Return ESLURM_NODES_BUSY rather than ESLURM_NODE_NOT_AVAIL error on job
submit when required nodes are up, but completing a job or in exclusive
job allocation.
Merge branch 'slurm-2.4'

Conflicts:
	NEWS
Fix for sinfo when loading info for a single node name
DOOOOOCUMENTATION!
Finished z80 instruction set
remove loadingNode when queries are canceled
Re-wire OnDemandList logic to make renderQuery handle errors properly
Allow List#row and Grid#cell to act as no-ops
Fix superfluous deselect events and Selector errors on row removal
typo
Merge pull request #102 from will123195/master

fix
BUG: issue #2665 cropping is disabled by default, but the ROI visibility is enabled by default, so need to turn the ROI off after it's been initialised and it's display nodes have been added

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21225 3bd1e089-480b-0410-8dfb-8563597acbee
changed encoding for sql file
only return last 1000 chat transcript messages
persist chat messages along with show control messages.
Only save tips for transcript
set redis client host/port
merge app-local.js transcript changes into app.js
ldscript depends on cpu, not board
Hahaha 2011 psh
Add a uriMatcher to the resource to allow a pluggable mechanism for complex uri template matching.
Update depenedncies, including FSharpx.Core, ImpromptuInterface, and WebAPI.
Simplify default routes.
Update ASP.NET sample to MVC4.
Add ContactManager example.
Replace FrankHandler with a more generic AsyncHandler.
Remove ReplyTo methods now that it's no longer necessary to pass the request and add a Body function to the HttpResponseBuilder.
Fix problem with the build.
Set up NuGet Package Restore.
Fix unit tests.
Update samples.
Allow for better uri template matching. Parameters are currently stored in a params array on the request.Properties.
Merge branch 'master', remote-tracking branch 'frank-fs/master'
Zippers lindos y bellos.  Ahora a usarlos.
monkey patched: zicron/message.rb. add force_encoding to UTF-8
style sheet and new HTML
Merge pull request #1 from TravisL12/homework2

style sheet and new HTML
Template Überarbeitungen
Further screwing up
ENG-3288 - Fix minor whitespace and left-over debug print.
For ENG-3768, modify voltkvqa to be able to test export performance
For ENG-37678, add missing second deployment file
For ENG-3768, use new DDL syntax for export tables
Merge branch 'ENG-3768'
ENG-4104: Initialize snapshot participants correctly.

Instead of letting each node increment the participant host count, the leader
who creats the completion ZK node write all host IDs down. Rejoining nodes will
then remove themselves from that list.
Revert "ENG-4104: Initialize snapshot participants correctly."

This reverts commit bb91cc3396e1d6917c68f363f7d9233d0a5f14d3.

Since rejoining node may not run the SnapshotSave fragments at all, the
coordinator cannot rely on the rejoining node to remove themselves from the
participating host count.
ENG-4104: Provide proper barrier to snapshot initialization.

To avoid having the SnapshotCompletionMonitor race with the snapshot
participants during snapshot initialization, the MPI which runs the SnapshotSave
sysproc gets the participating host count based on the hosts in the "hosts"
field in the snapshot completion ZK node. When each node finishes taking
snapshot, it decrements the host count. The SnapshotCompletionMonitor monitors
the host count and fires completion interests when this number reaches 0.
ENG-4104: Ignore NONODE ZK exception if snapshot creation failed.

If snapshot creation failed for some reason, the snapshot completion ZK node
will not be created. Ignore NONODE ZK exception in logParticipatingHostCount()
in this case.
Merge branch 'master' into ENG-4104
Merge pull request #305 from VoltDB/ENG-4104

ENG-4104: fix for snapshot completion monitor race
sqlcoverage: spread @col_type fixing timestamp vs. int value confusion
Add check for GetStringChars/GetStringUTFChars to licensecheck for ENG-3135
Clean up, less painful names to type and tested.
lost/damaged reason width constrict
Try compromising on the Makefile.
Forgot
Added one query function - GetListOfWikis
compile script compiles everything at once now
corrected position of text on avery address label
added toString method to Label
run file for QrLabeller now points to the correct directory
QrLabeller now uses XML configuration file

QrLabeller is no longer reliant on any hard coded constants. it reads all
dimensions from currentLayout.xml
V 2.6

Fixed various colorizing derps I didn't see because of spoutcraft as my
test client.
Basic gameplay finished
Added labs and projects
bug fixes, added new options

ability to fix spells always in same place
added ability to abbreviate spell name simply by adding abbreviation
after spell name in square brackets "riptide [rt]"
RunBlast: fixed lots of bugs! TODO: Erin will update_blast_setting and continue working on workflow.
Updated to v1.2 (see version_history)
Made the base for mouse/keyboard input handling
Added Boxfile with curl php extension
Merge branch 'master' of github.com:Zunder/spider
Updated .gitignore
moving `redraw.recordedplot` to pander
fix: cheking for `image` class of objects with multiple classes
Limited Search
Limited Search
Se actualiza SQL. Se agrega sql para la administracion del sitio.
Removed 'README'
Ignore the spew from the Haxe installer.
Add IRC contact info, and a spiffy travis badge.
Add delay functions
some random functions
new html integration
RenderComponent.cpp/h added. Not complete yet though
Merge branch 'master' of https://github.com/agelito/Racer
Re=arranged code, removed toggle effect.
Done basic logic in javascript and add some lines in css.
Added some css and new subscribers fiels in Post (api/models.py).
When post is created author is added to the list of subscribers.
-added fullscreen API, which lets you bring panel map into fullscreen.
-added functionality on that big google map panel: navigations control,  add custom control button on google map for switch on/off weather layer)
-added css style for fullscreen mode
-added event's pop up for nodes......
- set option draggable on true
-added Google Earth integration on Google Maps Api V3
Added OpenStreet map as a base layer on Google Map API V3.
Fixed one click on map for fullscreen mode.
Changed css style with java script for non-default buttons on google map(they look like default google maps buttons now).
Merging...
Made some changes, fixed subscribers list.
New comments are appending to user's notification list.
Updated from main repository. Minor changes in resources.py
Changed model's structure and move notifications from user to new model. Add notification to push server.
Created notification api so that fields in api are the same as fields sent to push server.
Add javascript code which displays simple notification list.
Fixed resources.py so that resource_uri is also pushed with other notification data and added some css for notification list.
- fix interactive big panel map
- add button exit to that panel
Do slide down animation over the all content on the page for interactive map.
Merge upstream...
Merge remote-tracking branch 'upstream/master' into notifications_#165
Fix mtu_exchange
hog: Fix removing HoG device bug

We should remove only hog_devices from the given btd_device.
Otherwise, all hog_devices will be removed.
hog: Rename hog_device.c to hog.c

As long as hog_manager.c and hog_device.h were merged into hog_
device.c, now the whole HoG logic is in this file. So, it is better
to call this file hog.c instead of hog_device.c since it doesn't
contain logic from HoG devices anymore.
hog: Rename hog_device_new to hog_new_device
hog: Rename hog_device_free to hog_free_device
hog: Rename hog_device_register to hog_register_device
hog: Rename hog_device_unregister to hog_unregister_device
hog: Rename hog_device_set_control_point to set_control_point
hog: Rename hog_device_probe to hog_probe
hog: Rename hog_device_remove to hog_remove
Use long double to count paths.
Merge branch 'master' into expression-order
Bump required boost version to 1.52
Doxygen documentation can be generated with 'make doc'.
Use @internal Doxygen command rather than @cond.
100 characters and whitespaces.
Expose public interfaces of homomorphisms directly into sdd::.

Internal parts stay in sdd::hom::.
Move internal::mem:: to mem:: and internal::util:: to util::.
Documentation.
Comments.
Merge branch 'master' into expression-order

Conflicts:
	examples/hanoi.cc
	libsdd.xcodeproj/project.pbxproj
	sdd/conf/variable_traits.hh
	sdd/hom/composition.hh
	sdd/hom/cons.hh
	sdd/hom/context.hh
	sdd/hom/definition.hh
	sdd/hom/evaluation.hh
	sdd/hom/fixpoint.hh
	sdd/hom/inductive.hh
	sdd/hom/local.hh
	sdd/hom/rewrite.hh
	sdd/hom/saturation_fixpoint.hh
	sdd/hom/saturation_sum.hh
	sdd/hom/sum.hh
	sdd/hom/values_function.hh
	sdd/sdd.hh
	tests/hom/common.hh
	tests/hom/test_hom_cons.cc
	tests/hom/test_hom_identity.cc
	tests/hom/test_hom_inductive.cc
	tests/hom/test_hom_local.cc
	tests/hom/test_hom_sum.cc
fix error in simhash
Disable timer notifiers.
(#16573) Properly quote and escape format string for eix

As reported in #16573, the portage provider did not properly quote
the --format string for querying packages, causing an error. This
commit should correctly offset it in single-quotes and escape the
newline so the output is parsable.
[Build] Improved the support of CMake-2.6 on RedHat/CentOS 6.x.
Merge branch 'trunk' into releases
Manual merge home/work settings.
mac-r drank 1839 bottles of wine
Refactor of references and addition of method.

Added a section describing the EOF solution method used.
Also removed the full API in favor of split references.
1，新增数据基数控制功能
1816
1817 - one more attempt; retreat to 1801
1818 - 'or', 'all' and 'some' all working with splice!

Why did I ever start looking for '' inside lookup?
Even if it's still a dead end, that makes no sense.
1819
1820
1821 - fixup inliner; all tests pass again
Force hidden scrollbars (mostly for older browsers)
Fix to Organisation Box Border in Issue #98

I have added the styling of the other boxes to the organisation box to
align with the rest of the page.
Removed PURE js rendering from global maps.
Using xtc (modified to compile) for Node edit dialog
webserver: add some explanatory comments
webserver: set the "Expires" header to 1 year in the future
webserver: add "Last-Modified" header to responses
CDateTime: implement SetFromRFC1123DateTime()
webserver: handle "If-Modified-Since" header for better caching
webserver: only cache HTML files for a day
fixed crash with rtmp, this fixes a 'coverage' issue but you really need to look at the code context next time
Merge pull request #1383 from alcoheca/locksettings

fixed: GUIDialogLockSettings was broke after pvr merge
[darwin] bump to librtmp head + 60-second patch, I give up trying to get tarballs from rtmpdump devs
Merge pull request #1366 from Montellese/webserver_caching

webserver: improved file caching
Merge pull request #1229 from alcoheca/upstream-playcounts
[UPnP] move UPNP code to it's own namespace
[UPnP] changed: make UPnP optional (enabled by default), fix some missing #ifdef HAS_UPNP guards
[UPnP] split off UPnPServer to separate file. move some static class methods to
helpers via internal header
[UPnP] split off CUPnPRenderer to separate file
Primera versión de netinfo basada en Demoiselle 2.3.0
.project add
Merge branch 'roman' of github.com:algos/filnais into roman
Merge branch 'gerard' of github.com:algos/filnais into gerard
config menu with errors
Config Card
compute tasks
mkar lesson as read
Articles Tags fix
Paginable tables and charts.
Url typo fixed
Merge pull request #15 from vi4m/master

Batch commit with paginable tables and charts
last documentation tweak of the night
Really fixed 64bit appbars.
some exceptions messages
Merge branch 'master' of github.com:alvesjnr/tOSM
landing layout semidefinitivo 2
archive command: suggests archive file name
added 'Reverting' state
gui improvements

* implemented RevisionHeaderToolTip
* added more items to context menus
Add HippopotamusMate
tests compile, though .server pkg needs a lot of work
Merge pull request #26 from amitnube/aggregation

modified column name (isAggregate to aggregate)
Merge branch 'aggregation' of github.com:sonalgoyal/crux into aggregation
Removed FunctionTypeMapping and added data to Function
Function and FunctionTypeMapping merge. Comment non working junits for now
server side functions - work begins
Export 'Util.PrettyShow' module from library
Fixes for PrettyShow
Add a fake filename for source positions
'and' between 'revealing' parts
use prettyshow in Main
separate atomicPatterns into top level
Fix pretty for 'open *and*' (not ',')
Precedence fix in prettyprinter
Give dummy source pos a fake filename
Remove '*' from arbitrary symbols because it's simpler
Single-arm matches etc. need no 'end'

Multi-way branches must start with a '|' and be followed by 'end'. If
there's only one branch and the '|' is omitted, the 'end' is optional.
add -std=gnu99 to Makefile
removed manifests, added nodes
Updated delivery endpoint added optional parameter type to call.
3521488 : Base pom.xml changes
3521488 : add sesame dependency
3521488 : distribution assembly bin.xml changes
3521488 : AbstractServiceLoader
3521488 : OntologyFormat namespace
3521488 : Add format methods to OWLOntologyDocumentSource

This allows users to specify known formats to make the loading process more accurate and more efficient.
3521488 : Implement new document source methods
3521488 : Ontology Storer Factories
3521488 : Reasoner Factory
3521488 : Profile Registry
3521488 : Parser Registry
3521488 : OWL Ontology Manager Factory Registry
3521488 : test changes
3521488 : Specific contract variations

* PrefixOWLOntologyFormat can no longer be directly instantiated
* All OWLOntologyFormat derivatives must implement getKey()
3535332 : Sesame RIO integration module
3535332 : SesameTools RDF/JSON integration
switch to using com.github.ansell.aterms:aterm-java:1.8.2 for pellet
Testing framework fixes and improvements backported from 2.6.
Redis test: More reliable BRPOPLPUSH replication test.

Now it uses the new wait_for_condition testing primitive.
Also wait_for_condition implementation was fixed in this commit to properly
escape the expr command and its argument.
A more lightweight implementation of issue 141 regression test.
Properly wait the slave to sync with master in BRPOPLPUSH test.
Add Linaro remote and directly use libjpeg-turbo
Bug 54259 - Introduce a CSS or jquery-like based Extractor
saveservice.properties
Bugzilla Id: 54259

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1422661 13f79535-47bb-0310-9956-ffa450edef68
Fix riemann.test.bench; had some typos.
Remove :focus from streams test.
Switch to the builtin Netty protobuf codec.

18% performance improvement in single-threaded TCP round-trip time.
EIGHTEEN PERCENT! YEeeeEEeEeAAaaAaAaaaAAaAAAHHhHHH!

We used to use clj-protobuf, back in the day, which meant we had to
decode netty buffers into protobuf objects, and write them back to
bytebuffers for the return trip. That required extra copies when we
could read/write directly from the Netty buffers. Since I switched out
clj-protobuf for the regular google protobuf classes, and worked out all
the compilation/namespace issues around that, we're free to get rid of
that parsing layer and switch to the built-in Netty protobuf codec.
Update migration.markdown.draft
add ui for personal session detail nav panel
wip
wip
Merge branch 'contacts-sort' into favorites
wip
Adding Basic CI utils
Refactored agent.js and added url config options. Made all paths absolute that relate to sandbox/proxy urls
Update test agent improve ci utils
Removing obsolete ci tools
Adding tools to start/stop emulator, run unit tests
Added shebang statements, some docs to config. Fixed path to runemu.py
Implementing the favorites functionality in the contacts.
Using a star toggle in the edit screen you can add favorites.
Then they are displayed on top of the contact list.

As per UX demand a favorited contact will be displayed in the favorites
list and in the classic list.
Merge branch 'master' into favorites
Last change to sync up with the new mozContact format
push settingsDB to the device with install-settingsdb
Some textContent hardening.
[what] Music App - add player page.
[why] Rebuild the Music App.
[how] Layout with HTML ans CSS.
Merge remote-tracking branch 'upstream/master'
Upgraded test-agent. Renamed (app)/test/index.html -> _proxy.html sandbox.html is now _sandbox.html. Added makefile step to autogenerate test boilerplate and directories
Updating boilerplate method to ln -sf from cp -f
Revert "Updating boilerplate method to ln -sf from cp -f"

This reverts commit 91d4c8913489987b177f06a175434e3288812416.
volume changing removed; overstocked torrents ui
modified the build_all.py for null string when input
Make the buffalo working.
Keep multiple selects consistent
updated to reflect architecture terminology change and api structure modifications
Fixed bug in Controller enter
Moving works a little better
load cpack helper when AcMake is loading
Fix eagerly loading associations without primary keys
Unset association when existing record is destroyed.

To avoid foreign key errors (and invalid data) in the database, when a belongs_to association is destroyed, it should also be nil'd out on the parent object.
Change JoinPart test from an integration to a unit test
use template0 option for creating activerecord test databases in postgres build_database task
Raise generic ParseError exception when ActionDispatch::ParamsParser fails parsing request params.
Fix ActionDispatch::ParamsParser::ParseError message for XML and JSON parsers.
Make ActionDispatch::ParamsParser::ParseError#original_exception return the original exception.
Fixed validation issue in Upgrading Ruby on Rails guide [ci skip]

In chapter 2.4 there was an underscore at the start of the attr_readonly method name,
this underscore was interpreted as the opening of the <em> tag but it wasn't closed.

Worst, the underscore in self.class.serialized_attributes (end of paragraph)
was interpreted as the closing of the <em> tag and not as the name of a method.
Underscore in _attr_readonly method name is back (Upgrading RoR guide) [ci skip]
Fixed validation issues related to taken IDs in AR Querying guide [ci skip]
Fixed validation issues in the "Configuring Rails Applications" guide [ci skip]

erb tag wasn't closed well
Fixed validation issue related to taken ID in Layout and Rendering guide [ci skip]
Fixed validation issue and titles in Migrations guide [ci skip]

Changed the title of the 3.5 chapter from "Using the change Method" to
"When to Use the change Method" since the chapter tells the migration
definitions supported by the change method. This fix the duplicate ID in the
document.

I've also changed some of the titles to respect the Guides guidelines.
Fix indenentation in comment to stop the end of comment from appearing in a <pre> block.
Add section about tagged logging

Tagged logging for which Rails has support since [3.2](http://guides.rubyonrails.org/3_2_release_notes.html#tagged-logging).
It is trivial & useful but unless somebody explicitly searches API docs, he/she may not know about it. 

Hence, I added it in guides. 
Update caching guide: memcache-client was replaced with dalli
update caching guide: stale? can also figure out last_modified on its own
Add giant belongs_to 'please don't pluralize me' note

I've personally seen too many newbies get this wrong and pluralize the association
Fixed array wrongly translated in footnote in a guide [ci skip]

In the sentence "If <tt>@post.author_ids</tt> is [1], this would ..."
the array [1] is converted in a footnote, fixed this using <notextile>.
Fix a typo
Web service can now serve JSON
Se extraen funciones comunes de los tests.
Se crea un parser para sacar estadísticas del progreso del parseo de los ficheros.
Move main.mk functions into bin/orgpress.
Всякие клевые штуки
Teścidło
add hotspot flag
Merge branch 'master' into gh-pages
add pdfsam tool for pdf spilt/merge
Docas.io synced with a2c1807: update filelist
Test Image In Documentation
Please make a config file that hides your password. Use .gitignore to hide it from source commits. You will want to change your password as well so it doesn't show up in early commits. 
Merge pull request #1 from zmaril/patch-1

Please make a config file that hides your password.
update
update
staging
Merge branch 'master' of github.com:baoshan/fairy
update
merged changes from the mainline repo
Use var for local scope.
forgotten initializer line
again trying to fix a missing initializer from branches
Move enums away from global namespace:
- EOverlap is now in namespace Rgl;
- EClipType is now in class TGLClip;
- EPosition and EManipType were not used and have been removed.

EGLCoordType and EGLPlotType are left in top-level. In these two enums all
names begin with kGL so there is less chance for collision.


git-svn-id: https://root.cern.ch/svn/root/trunk@46574 27541ba8-7e3a-0410-8455-c3a389f83636
Added possibility to prevent known overlaps produced by misalignment by assignig priority to one of the candidates. This is not using the error prone AddNodeOverlap method, but composite shapes. One has to create the unprioritized shape as the subtraction of the original one and the shape of the node to prioritize, then position this composite shape colume with identity matrix. The prioritized volume should be added as node using the same local matrix as the one used in the subtraction operation. The matrix itself has to be declared shared via SetShared() method. Added few parameters to the RandomRays method.


git-svn-id: https://root.cern.ch/svn/root/trunk@47228 27541ba8-7e3a-0410-8455-c3a389f83636
add implementation of Chebyshev polynomial as
requested in https://savannah.cern.ch/bugs/?88085
in ROOT::Math::ChebyshevPol(n) class 

Add in TF1::InitStandardFunction automatic creation of Chebyshev polynomials
up to order 10. 
Support for storing them correctly in  afile (without using TF1::Save ) will be implemented in 
future versions


git-svn-id: https://root.cern.ch/svn/root/trunk@47229 27541ba8-7e3a-0410-8455-c3a389f83636
fix name of the chebyshev polynomial functions


git-svn-id: https://root.cern.ch/svn/root/trunk@47230 27541ba8-7e3a-0410-8455-c3a389f83636
created users and skills
Axiom of choice & Zorns lemma
upgrade to Smarty 2.6.27
Updated to use Entity 6
Remake Inflector
Update nuevo2.txt
'old-tech-test' tests Tech class from 'old-tech' module directly
Old techs moved to test/data/
tests: Build with deps.js as declaration; canonize new tests results
tests: Build ie.css tech; canonize tests results
Some code cleanup in techs/deps.js.js
Extend Tech class API, vows tests for Tech class, introduce OldTech class for backward compatibility with legacy tech modules

Tech class API:

 - move createTech() static method to module level

 - add default value for techModule property

 - add support for multiple prefixes, add getPrefixes() method

 - rename getPathByPrefix() method to getPath() with semantic change

 - add getCreateResults() method, change semantics of getCreateResult()

 - add storeCreateResults() method, change semantics of storeCreateResult()

 - rename readPrefixContent() to readContent(), add readAllContent() method

 - add getBuildResults() method, change semantics of getBuildResult()

 - add storeBuildResults() method, change semantics of storeBuildResult()

 - new criteria of shortest path in getTechRelativePath() method: path components count instead of path length of string

OldTech class

 - adapter to Tech class from 'old-tech' module

 - proxies create(), build(), readAllContent(), getTechName() and getTechPath() to equivalents

Commands

 - add --force flag to 'bem create elem' and 'bem create mod'

Tests

 - add tests to new Tech class

Tech modules

 - refactor to use new Tech class

 - refactor of Deps and DepsItem classes to use 'inherit' module

Package

 - add 'vows' to devDependencies
Refactor Context class to use 'inherit' module
Refactor Level class to use 'inherit' module, add getDeclByIntrospection() method to generated declaration for level
Refactor Level class to use 'inherit' module; canonize tests results
Refactor Tech class

 - Rename 'old-tech' to 'legacy-tech'

 - Move legacy techs from test/data/old-techs to lib/legacy-techs

 - Introduce getTechClass() function to 'tech' module

 - Add 'path' param to Tech class constructor

 - Get rid of this.techModule in Tech class

 - Strip all known extensions in getTechPath() method of Tech class

 - Use process.env.NODE_PATH instead of require.paths for node.js 0.5+ compatability

 - Move legacy tech object creation to LegacyTech class constructor

 - Actualize tests for legacy techs
Refactor getTechPath() and getTechRelativePath() methods of Tech class

 - Remove getTechPath() and techModule from tech modules

 - Use module.paths + NODE_PATH instead of require.paths during relative tech modules path resolution (also windows support)

 - Actualize tests
Prettify of lib/bem.js
More precise detection of legacy tech modules
Fix documentation
close #15: Use Deps in "bem decl merge"
Merge branch 'nodejs' of github.com:bem/bem-tools into nodejs
Tech class API documentation
close #15: Use Deps in "bem decl merge"

Merge commit '0f28d1ae499e96f5ef9ac375585dfdce77d2458a' into api

Conflicts:
	lib/commands/decl/merge.js
'bem decl' docs
Tech modules API docs link
fixed some ocup stuff
problem with dates in downloads
Update jQuery tagsinput widget
fileman_Download - issue #18 Показване на размера на файла.
Добавена възможност за вземане на файлове от линк
bugFix
Merge branch 'master' of github.com:bgerp/vendors

Conflicts:
	fileman/Mimes.class.php
Корекции по oembed
Частично не се създават нови имена, на вечи съществуващи файлове
Work on internal data structures
Initial version of working evaluator
Update build for CoffeeScript 1.3.3.

Updated for CoffeeScript 1.3.3. Mostly changed owing to octals.

Updating to use production Streameline.js, instead of my stop-gap Streameline.js.

Also, NPM doens't like self dependency any more, so test have been updated to
reference the project's `lib` directory.

Updated `vendor/twinkie` to support upstream changes made for CoffeeScript
1.3.1
Merge branch `redundant` into `travis-ci`.
Merge branch `version-0.0` into `master`.
Print summary on `run` and `plan`.

Now printing a summary the moment the program runs and the moment it
gets a plan.

Closes #28.
Merge branch `early-summary` into `travis-ci`.
fix test. fix custom_tag. add to gitignore : *.db . fix fixtutes.
escape some special markdown characters
kalua: db: restore() reschedule if it fails
Regenerate bootstrap.css with merged v2.0.4.
Fix build.rb location.
Fixed including wrong file;
Brought data_skip down to 0, NITE didn't like it
Messing with parameters
Added Chad's thesis for reference
Added
Make the data sparse before feeding it into liblinear.
changed the format filter attribute to be more flexible

created the workcenter group url in the header
created the workcenter listing and status for a workcenter that works in groups
added items to the workcenter display model
Had to override the save method on batchjobrepo to only save workcenter/job once
created workcenter running status functionality
on c/cpp validate, handle markers w/ no CHAR_START

NPE reported in #158
handle c/c++ error markers which use LINE_NUMBER

some markers set CHAR_START to -1, so fallback to using LINE_NUMBER

issue reported in #158
Merge remote-tracking branch 'blueyed/optimize-php-search'
Merge branch 'master' of git://github.com/ervandew/eclim
ocamlbuild-mixed-boot is not phony

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.00@12927 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
testing commit
grade level change
added editor component
Add --no-measurements mode

The new mode minimizes the amount of work performed by criterion.
This allows to use conveniently the same code for benchmarking and profiling.
Merge