labofsahil/github-event-dataset-2012 huggingface dataset:
Fix typo
Update CQL pseudo-maps to real maps

patch by xedin; reviewed by slebresne for CASSANDRA-4497
fix FD leak in slice queries
patch by jbellis; reviewed by Sam Tunnicliffe and tested by brandonwilliams
merge from 1.1
increase Xss to 160k to accomodate latest 1.6 JVMs
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4602
merge from 1.0
Merge branch 'cassandra-1.1' into trunk
use millis + atomicint for commitlog segment creation
patch by amorton; reviewed by jbellis for CASSANDRA-4601
merge from 1.1
fix broken system.schema_* timestamps on system startup
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4561
merge from 1.1
change SYSTEM_TABLE to SYSTEM_KS related to CASSANDRA-4561 merge
SSTABLE_SIZE_OPTION constant s/b static
Use the correct stream id for error message
Fix assertion error when preparing query without parameters (binary protocol)

patch by Christoph Hack; reviewed by slebresne for CASSANDRA-4577
add ntp Recommends to Debian package

Patch by paul cannon; reviewed by eevans for CASSANDRA-4606
Avoid special characters which might confuse ant.
Respect 5min flush moratorium after CL replay; patch by yukim reviewed by jbellis for CASSANDRA-4474
Merge commit 'refs/top-bases/p/4443/010_refactor_range_move' into p/4443/010_refactor_range_move
Merge branch 'cassandra-1.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
	src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
Add missing file
cqlsh: in cql3 mode, use cql3 quoting when outputting cql.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4173
Merge from 1.1
Merge commit 'refs/top-bases/p/4120/01_create_store_host_uuid' into p/4120/01_create_store_host_uuid
Merge commit 'refs/top-bases/p/4120/02_uuid_in_application_status' into p/4120/02_uuid_in_application_status
Merge commit 'refs/top-bases/p/4120/03_reference_node_by_hostid' into p/4120/03_reference_node_by_hostid
Merge commit 'refs/top-bases/p/4120/04_remove_node_by_hostid' into p/4120/04_remove_node_by_hostid
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Attempted Circumvention of NoCheat Style Plugins' Anti-Fly
Use yield directly inside core array methods
ttt as worksheet
play returns Option[OUTCOME]
enrichments worksheet
add SimpleBasketService and SimpleBasketServiceTest + refactor
Merge branch 'master' of https://github.com/adamszabo/fitty
Fixed error with encoding in unicode; unicodeencodeerror does not happen
any longer. Now to work on fixing the tag stripping process
updated HTML title on homepage
updated gems
updated gems, including VCR to 2.0
downgrade linecache19 dependency (was using unreleased version) - fixes #8
updated gems
fix github ribbon
Merge remote-tracking branch 'origin/master' into single-convert

Conflicts:
	Gemfile
	Gemfile.lock
	spec/spec_helper.rb
views + menubar
Style updates, logged in landing page, threaded messages
擎天柱の蓋造
ChemistrySlash!
人人都说李晓红太纯真善良了
人们让李晓红选一样东西
来形容自己
李晓红纯真地笑着纯真地说着
巧克力味泡芙
真可爱呀！
人们大声说道
泡芙的心是甜的呢！

其实李晓红是想说自己的心是黑的
spring cleaning
added a package.json to help install dev dependencies
README edits
better copyright character
update package.json with more devDependencies
setup test harness
add expect.js to devDependencies
added coffeescript to devdependencies (for compiling test suite)
added coffeescript test compilation to makefile
nullcheck for lazy load fn
added ListView unit tests
make sure page exists before trying to read from it
added ListItem unit tests
re-annotate
Fix the typo about hidden elements
comment fix
Merge pull request #1 from tbassetto/patch-1

Fix "display" value in the "caveats" doc
repartition on resize
fix infinite-resize bug
[refactor] that = this. For better minification
favorites & DB
none
dding files
Merge https://github.com/ajdaniels/utils
werwer
Merge https://github.com/ajdaniels/utils
dfsdf
removed current user from template values - ajv
redmine 2.0.4 added
emacs: stuff for org-mode
emacs: line highlighting and line numbers
emacs: use el-get init-package mechanism instead of hooks
emacs: custom-set-variables didn't like this
emacs: load org-mode stuff in init-org
emacs: cleanup el-get packages on update
emacs: moved "TODO" packages into a separate file
emacs: preparing to keep sources and packages separate
emacs: don't treat el-get and package as special
emacs: don't use special "emacswiki" sources
emacs: move pure packages to my:el-get-packages from sources
emacs: slightly more traditional way of loading el-get
emacs: tidied up some comments
Fixed problem with the resolution factor.
delete goal_internal.h, not needed.
cosmetic: py: cleanup the public module members.
temporarily fixed: SLES network different interfaces keep popping up.
Authorization
Added coverage folder to list of ignored folders
Merge branch 'master' of https://github.com/ChrisJTaylor/TAF
Readded Tony's files that I removed with a previous checkin - sorry, Tony!
Added static home page.
Added rspec test for home page.
Added basic haml view for home page.
Added capybara to gemfile.
Added guard to gemfile.
Added guardfile and amended to stop at first failing test.
Fixed to use pg instead of mysql
Enviando a config do ambdev(nao completo)
Future: imported from qitype, but using boost::signals2 for signal.

Change-Id: Ief163e07087c32d379526728608e3129f586d65a
Reviewed-on: http://gerrit.aldebaran.lan:8080/6975
Reviewed-by: cgestes <gestes@aldebaran-robotics.com>
Tested-by: mnottale <mnottale@aldebaran-robotics.com>
Revert "Future: imported from qitype, but using boost::signals2 for signal.", breaks macos build.

This reverts commit 477bf2b1cb101d07d1df94ad77e6712c8609f1ef.

Change-Id: Ibbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
Reviewed-on: http://gerrit.aldebaran.lan:8080/7116
Reviewed-by: mnottale <mnottale@aldebaran-robotics.com>
Tested-by: mnottale <mnottale@aldebaran-robotics.com>
add clock injection to mocktagdao
Merge branch 'integration' of github.com:ning/killbill into integration

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

Conflicts:
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementDao.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementSqlDao.java
	entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java
Changed payment api to not return error for 0 invoice
Merge branch 'master' of github.com:ning/killbill
Merge
Merge branch 'master' into payment-plus-account
updated poms for release; changed number of decimals in invoicing; fixed tests
changed pom version number back
Implement the load/store instructions into the disassembler.
yodack: Mention the two aliases for dm on the man page

The dm action is also available under the 'debian-maintainer' and
'debian maintainer' aliases, mention those in the manual page.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Vim: set smarttab, remove tabstop to use shiftwidth value instead
Replace rvm with rbenv and ruby-build
Fix Rakefile require for ruby 1.9
Zsh: prevent duplicates when setting $PATH
Add virtualenv hook to change envname style in prompt
Autoload zargs
ZSH prompt: change colors, replace git flags with jobs flag

Git status is slow on big repositories.
tmux: disable ], [ repeats for interfering with arrow keys
Change Rakefile to build ruby 1.9.3
Fix Python.framework symlink path
Slightly tweaked zsh prompt colors
Pentadactyl :py command to search python docs
tmux: change window/pane switch keys, copy-mode
Add DTrace dnet script for quick list of new network connections
Fixing mapnik grid usage: different grids for different layers
reverting to idea of having path with host/path instead of separate fields
add ContentFilter/ContentFilter.php
Developing. It's not clear
refactor to reduce nesting & increase clarity
less jshint nag
`externs` for Closure from individual packages

the `options` object that initially contains options from the
commandline that are then passed to the minifier is first passed through
each of the source packages (bundled libs, including dependencies) and
extended if there is anything to extend. Currently just the `externs`
property.
version bump & update changelog
remove closure.jar, it's in ender-minify
added template for individual source files
make tests more robust
curses to travis
new dev release
fix closure jar path
more robust minifier test (for Travis)
TRAVIS! Give me a break!
merge upstream
specs for remote files
Move dealing with GLX extensions to the very end
Add blind dpy redirection for GLX extensions
Display contexts should not be shared
Move member functions of tsprimus into D
Move PBO bufs into tsprimus
Drop PBOs on context switch
Slowly but surely pass the first frame for display
Add notes on benchmarking and contributing
Add missing -lrt for clock_gettime
Use $LIB to help multilib environments
Load libGLa after needed_global in case libGLa is Mesa as well
Verify that opening secondary X display was successful
test onmessagerecieved
Merge branch 'master' of github.com:anahm/trproject
Pooja/Aasawaree: Fixed UI Bug: CI job name below Type of Test
Use flashing red text when logged in as root.
reports finally
try to fix the last few emulator failures
Merge pull request #1497 from davidflanagan/synthemu

try to fix the last few emulator failures
Bumped version to 0.1-07
moving files for agent / dashboard mechanism
finish 0.0.3
reWZ: Fix WZImage enumerator; allow calling enumerator on objects without children

Signed-off-by: angelsl <hidingfromhidden@gmail.com>
New todo syntax for vim
Some new tips in mine vimrc
Add bounce btw <>, If loop for GUI & Show tabs and trailing spaces
ignoring .sln
adapted to new shortcut functions
Update env-setup script to make it work better
Fix redundancy in .gitignore file
Fix documentation consistency in .gitignore
small patch to fact gathering for when no dmesg.boot exists on freebsd, mainly happens in jails
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
Add FILES to manpage
update changelog
HP and vsphere modules are crazy awesome but I am thinking these belong in contrib not core.
Mention nixos package
Stop embed promotion
merge develop branch mustella test fixes to release4.9 branch (except mobile fixes). Rev #'s: 1424357 1424836

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/sdk/branches/release4.9@1425250 13f79535-47bb-0310-9956-ffa450edef68
python: oops, fix handling for tests in current directory instead of t/

And add a test for that case so we don't break it in the future.
calling Core.py and Material.py fixed...
changed scm url of package.xml to the readonly one
fixes and tests for the loadable dependency , di container
file read is moved into the file handler
adding exception handler which is configurable to the file handler
HDFS-4179. BackupNode: allow reads, fix checkpointing, safeMode. Contributed by Konstantin Shvachko.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411509 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9042. Add a test for umask in FileSystemContractBaseTest. Contributed by Colin McCabe


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411882 13f79535-47bb-0310-9956-ffa450edef68
merge -r 1411883:1411884 from trunk. FIXES: HADOOP-9072

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411891 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1412076:1412077 from trunk to branch-2. Fixes: HADOOP-9049. DelegationTokenRenewer needs to be Singleton and FileSystems should register/deregister to/from. Contributed by Karthik Kambatla.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1412079 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1412237 from trunk for HDFS-4216. Do not ignore QuotaExceededException when adding symlinks.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1412244 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1412377 FIXES: MAPREDUCE-4811. JobHistoryServer should show when it was started in WebUI About page. Contributed by Ravi Prakash


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1412378 13f79535-47bb-0310-9956-ffa450edef68
temporary dump

Signed-off-by: Anton Arapov <anton@redhat.com>
xref: allow multiple behaviours and ignore_xref pragmas
eunit: analyze coverage only for cover compiled modules

This change fixes #310.
Restore ability to specify deps_dir on the command line

It was previously possible to run `rebar compile deps_dir=/path/to/deps`,
but as of 70d27c5720331076f52e4fd7bcd1dc8045c8c86a, it was nixed.
rebar_deps: fix whitespace errors
Document availability of rsync for fetching deps in rebar.config.sample
Merge pull request #316 from danielwhite/document-rsync-feature

Document availability of rsync for fetching deps in rebar.config.sample
Add Daniel White to THANKS file
Revert 15b7798e4 and restore old git-describe call

Restore previous 'git describe' behaviour as discussed here:
http://lists.basho.com/pipermail/rebar_lists.basho.com/2012-September/001713.html
Fix fprof use (-p/--profile)
deps: add fossil scm support
Add Martin Schut to THANKS file
Fix whitespace errors
noshell/noinput should NOT be the default emulator args for an escript
rebar_edoc: use correct proplist() type (Reported-by: Kostis Sagonas)
Merge branch 'master' of git://github.com/basho/rebar into mytemplates
Printing NaN values as "nan" in printFloat().

http://code.google.com/p/arduino/issues/detail?id=946
addition of winston module
Started work on getting Profile data
updated patches

Signed-off-by: Aristeu Rozanski <aris@ruivo.org>
Get ready for 1.5.0.
Changes for 1.5.0.
Test for pinConnector
Merge branch 'master' of https://github.com/artagesw/FROIDZ
Added wp stuff
Merge branch 'master' of https://github.com/artagesw/FROIDZ
Modified the 'construct' method for polygons to consider complex polygons with inner rings
Use jruby-pageant >=1.1.1, because 1.1.0 has a bug.
fixed readme again, fixed template for python
added support for all regions
sublime 1.1
Setting immediate angle as well
Merge branch 'master' of github.com:asantee/ethanon
Implement some windows fileio methods
bug fix to make the timing work properly
Merge commit 'edd1e71' into flighttest1
Simplified global.document lookup by passing in to closure
Simplified <head> lookup to save some bytes
Automapping: Removed the no-tile exception (incompatible!)

This change is motivated by issue #306.
The no-tile exception made sense at times when the set layer was
the only input layer. (That is version 0.8.1 and before)
Now this exception causes trouble as Automapping does not
produce expected results.

This commit finally makes the Automapping incompatible to the
Automapping rules of version 0.8.1 and before.
Having spare input layers produces a different behaviour
now than before.
However not all hope is lost, the Automapping on quite filled
input layers behaves the same as before, which I expect to be the
standard usecase.

Closes #306
Change layer data format with an undo command

Makes sure the map is marked as changed, so that the user is prompted
when forgetting to save this change.

Also moved the different formats enum from MapWriter to Map.

Fixes #307
Fixed eraser skipping tiles when moving fast

Instead of erasing just the tile below the mouse, erase all tiles between
the last and current tile position.

The same fix was applied earlier to the stamp brush in commit
9a397baa4c35c2a8e2f07b77d2b6e5949faf8d5c.
Fixed view position reset when zooming after scrolling with wheel

The view reset its position when scrolling using the mouse wheel,
quickly followed by a control-wheel to zoom.
Flare plugin: Fixed crash on opening certain non-Flare txt files

Also added missing spaces to the error message shown for non-Flare txt
files.
Fixed saving new files to no longer trigger an error message
implemented properties for object types and applying type properties to objects
Merge branch 'object-types-properties' of github.com:astillich/tiled into object-types-properties
bosh_server: clear timer on 'terminate' responses
doc
typo fix in overview.rst
Add the document pdf file
icons and some minor changes
search fixed ,icon updated on top of dropdown and carpartlist quote form update
commit for bugs resolution
more of tim's stuff
Fixed a typo in the failure recovery script name
added amqp_server_uri to user_data in instance.
a lot of changes.. forgot to commit earlier
Remove more finished TODOs
More removed TODOs
Modal backdrop is now more transparent
Updated TODO
#129 ready for testing
Reader API: write content on demand
Replaced ReaderPackVisitor with ReaderFolderVisitor
Cthulhu 0.1 subido
listo con icono
remove duplicate function definition (moved to application.js)
Making an effort to use this with Debian.
tweaked note on Enterprise docs
Merge branch 'master' of git://github.com/basho/riak_wiki
made contact Basho links on EDS docs open in new tab
adding a text mode
Newest uptade some neat hooks added
Updated lesson #10 presentation
Fix raw_input and a few str built-in calls
load efivars at boot
Contact page and the rest of the exercieses completed.
Move the index page to /
fx dialogs added
newline before definition list (just like ul and ol)
markdown pre rule
remove stopwatch on uibean
Updated tag icons
Get 'content' out of templates.

I had used 'content' field in a couple forward facing locations, when
it is meant as a purely administrative container field. Changed
to substitute 'desc' field instead.
More speed optimizations

Instead of disabling sort, sort is not enabled until the list is
loaded for the first time.
Bug 804571: Support for canceling (pausing) system update downloads. r=etienne
Move app / system update cancel tests into separate suites
Bug 816823 - Add UA override for maps.google.com - r=ochameau
Added space below the input so it's not blocked by keyboard
Bug 817066 - Don't offer word suggestions for wifi password
Merge branch 'master' of git://github.com/mozilla-b2g/gaia into updateDownloadCancel
Bug 818090 -  Replace data-l10-id with data-l10n-id

Also fixes bug 817914, confirm-passcode failure message uses incorrect grammar
Merge pull request #6805 from Rik/wifi-psk-suggestions-817066

Bug 817066 - Don't offer word suggestions for wifi password
[Bug 796904] [sms] messages of class 0 shows in status bar & lock screen but not available in messages view r=etiennesegonzac
Merge pull request #6724 from marshall/updateDownloadCancel

Bug 804571: Support for canceling (pausing) system update downloads.
Merge pull request #6801 from borjasalguero/messages_class0

[Bug 796904] [sms] messages of class 0 shows in status bar & lock screen but not available in messages view
Bug 812924 - rotated video (and native previews) for Camera
Merge pull request #6799 from davidflanagan/camerapreview

Bug 812924 - rotated video (and native previews) for Camera
Bug 817485 - Do setVisible() and manage stacking of attention frames based on telephony permission
Merge pull request #6800 from timdream/system/attention-screen-stack

Bug 817485 - Do setVisible() and manage stacking of attention frames based on telephony permission, r=etienne, a=blocking-basecamp
Bug 814632 - [Clock] Put a silent alarm screen underneath the oncall screen if the alarm goes off during a phone call r=timdream
Merge pull request #6816 from ian-liu/clock/Bug814632_silent_alarm_screen_underneath_call_screen

Bug 814632 - [Clock] Put a silent alarm screen underneath the oncall screen if the alarm goes off during a phone call r=timdream
Merge pull request #6803 from fcampo/ftu_input_blocked

[816191] Email input covered by bottom toolbar
Bug 815381 - Apply animation after the target panels loaded and positioned
Merge pull request #6817 from crh0716/815381

Bug 815381 - Apply animation after the target panels loaded and position...
Reduce iterator template and `_.bindAll`.
Update vendors.
Allow `_.sortedIndex` to accept a string value.
Merge branch 'master' of github.com:bestiejs/lodash
Make `_.range` coerce arguments to numbers.
Fix recent typo in `isEqual`.
The first (and non-working) version of properties and selections.


git-svn-id: http://root.cern.ch/svn/root/trunk@44983 27541ba8-7e3a-0410-8455-c3a389f83636
Add patch pending for clang (better first to test it on all platfroms with EC before we upload in clang mainline)\n Update the last known good llvm rev set.


git-svn-id: http://root.cern.ch/svn/root/trunk@44984 27541ba8-7e3a-0410-8455-c3a389f83636
Add a new optional parameter to turn off the printout. It is needed is order to
call this macro from stressGraphics


git-svn-id: http://root.cern.ch/svn/root/trunk@44985 27541ba8-7e3a-0410-8455-c3a389f83636
Two new tests. 
- Pad cloning
- Ntuple drawing with alphanumeric variables.


git-svn-id: http://root.cern.ch/svn/root/trunk@44986 27541ba8-7e3a-0410-8455-c3a389f83636
oops we need controllers
remove dotless syntax on filters
simplify API and update demo
Merge branch `xml-error-path` into `master`.
Implement `if`.

Implemented `if`. Created `prune` which removes a node an resumes.
Common to both `if` and `each`.

Closes #31.
Merge branch `if` into `master`.
Implement HTML serializer.

In the browser, we're going to import nodes using `Document.adoptNode`.
On the server side we do need to serialize, but it only needs to work on
the server. We can have a minimalist serialzer.

Because we remove CDATA sections in our generator, we can rely on a
regular expression to fixup void elements, and close empty elements. Our
serializer will only work for XML that describes HTML5 and has no CDATA
sections.

Added some notes to the `README.md`.
Merge branch `serializer` into `travis-ci`.
Implement `each`.

Changed the `xmlify` function to visit the children of the node at the
base of the stack, rather than the node itself. This means passing in
the document node in instead of the document element node when
traversing the root document or an included document. That is the only
real change. When we visit blocks, visting the root of the block is a
no-op in our current set of tests.

Closes #7.
Merge branch `each` into `master`.
Fix setKeyType for composite key
convert 4 tabs into 4 x 4 spaces in bitcoinrpc.cpp
Merge pull request #1266 from Diapolo/tab_to_space

convert 4 tabs into 4 x 4 spaces in bitcoinrpc.cpp
Correct position of xss filter
Added smartpointer.hpp - Templated SmartString
Updated csmartstring - operator=() should decrement before assigning to other
Avoid overriding existing environment variables

This allows overriding variables by setting them in your env before starting the app. If an environment variable is already set, its probably for a good reason.
Load environment specific files first

Since it no longer overrides existing variables, it makes more sense to set the environment-specific variables first. 
Customize rake task for Rails

This ensures environment-specific configs get applied first in rake tasks.
Merge branch 'do-not-override'

* do-not-override:
  Customize rake task for Rails
  Load environment specific files first
  Avoid overriding existing environment variables
Release 0.3.0
[ADD] CSS default file
Begin to fix python pathing.
Merge branch 'master' of github.com:blc56/PlanetWoo
c.logMove()
controls for selecting board size and restarting
Disabling html5_tool's over-ride of URL link fields.
Merge branch 'master' of https://github.com/bleen/studioone
Lightening font weights on the footer
correccion nombre carpeta
added files for data creation
Create readme.md

summary of app (and that it doesn't do much right now)
added example2.js server by xmasferrer
regenerate specs
add report plugin to main pom
uv: Upgrade to 171e2f71b9
npm: Upgrade to 1.1.31
blog: Generate RSS feeds
blog: add RSS link tag for discovery
uv: upgrade to 0387c23
npm: Upgrade to 1.1.32
docs: Switch to the asynchronous Google Analytics snippet

The old snippet needlessly uses `document.write`. Let’s use the
optimized version of the most recent, asynchronous GA snippet:
http://mathiasbynens.be/notes/async-analytics-snippet
Hotfix for #3528 Add strdup in uv_cpu_info
2012.06.25, Version 0.8.0 (stable)

* V8: upgrade to v3.11.10.10

* npm: Upgrade to 1.1.32

* Deprecate iowatcher (Ben Noordhuis)

* windows: update icon (Bert Belder)

* http: Hush 'MUST NOT have a body' warnings to debug() (isaacs)

* Move blog.nodejs.org content into repository (isaacs)

* Fix #3503: stdin: resume() on pipe(dest) (isaacs)

* crypto: fix error reporting in SetKey() (Fedor Indutny)

* Add --no-deprecation and --trace-deprecation command-line flags
* (isaacs)

* fs: fix fs.watchFile() (Ben Noordhuis)

* fs: Fix fs.readfile() on pipes (isaacs)

* Rename GYP variable node_use_system_openssl to be consistent (Ryan
* Dahl)
Merge branch 'v0.8.0-release' into v0.8
Now working on 0.8.1
blog post for v0.8.0
docs: add punycode to TOC

Refs #3301.
windows msi: don't use .exe file as icon

This makes the installer nice and small again.
windows: remove 256x256 version of the icon

Nobody needs that anyway, it's just eating up space.
doc: replace references to cluster.autoFork
v8: upgrade to version 3.11.10.12
v8: reapply floating patches
build: disable strict aliasing in v8 with gcc 4.5.x

The gcc 4.5.x have various bugs that make V8 crash in various and interesting
ways when -fstrict-aliasing is in effect.
Merge remote-tracking branch 'origin/v0.8'
GNU: Comment `fdisk' out.

git-svn-id: https://nixos.org/repos/nix/nixos/trunk@33907 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
* Remove redundant section on building the installation CD.


git-svn-id: https://nixos.org/repos/nix/nixos/trunk@33909 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
* Fix some links.

git-svn-id: https://nixos.org/repos/nix/nixos/trunk@33910 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb
SM start
Merge branch 'master' of github.com:boazadato/smtry
removed files outside of directories
added: ladspa dither filter, it will add one bit noise to the audio samples, when the samples are converted to integer format the noise will dither the audio
fixed: comparison is supposed to be done on CJackPort, not on the iterator itself, since that will always return false
Add comment to region tree
Revise tree interface
Moved all music/sound effects into its own folder.
added more options and fixed up color prompt in zshrc
Move tests of sp_sum.
expotentially decaying sample fixes
Commented example element, added RGB utilities.
fixing dcm2nii
Command line interface added w/ options
updating app to run independently of subdomain
removed ip_version()
Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6
fixes
remove text about ipv4/ipv6 support in the doc
Merge pull request #1435 from jjaffeux/valid-ipv6

IPv6 support for CI_Input::valid_ip()
fixes
Merge pull request #1438 from IT-Can/form-helper-fix

Form helper fixes for issues triggered by 773ccc318f2769c9b7579630569b5d8ba47b114b
Remove some unnecessary function_exists() checks and some minor improvements
Deprecated do_hash() and read_file() in favor of hash() and file_get_contents() respectively
Revert 296ab9a06e3c648de56861ad67581236a6dae71a - there's no bug to fix
Suppress errors from file_get_contents() in read_file()
Added a work-around for MSSQL/SQLSRV create_table() with INT column types (column lengths are not supported)
Fix issue #861 (and previous commit, for that matter)
Merge pull request #1436 from jjaffeux/tests-text-helper

Tests text helper
Removed UserVoice link
Merge pull request #1440 from jjaffeux/patch-1

Removed UserVoice link
replace get_config by config_item
tests for encryption class
Merge https://github.com/EllisLab/CodeIgniter into test-encryption-class
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqlite
First Part

plantillas... sin horarios y con pendientes Esteban
Allow overriding of default column family name for model
Bump version
Update Changelog
Fixed, we are now using cookies.  Let me know if you would like to add
more.
Data shell
1.修改小组管理没有查询到任务时的提示信息。
1.登录后组员定向到root_path,组长定向到group_tasks_path.
spring data jpa migration finished
Adjust fb key placeholder
adds wrapper for deleted function, since the exact arguments to p4 diff are not straightforward
Parses hex values
Adds function to check is the expression results in a string
Removes unused function
Fixes only compare nodes that either both result in values or strings
Adds comparison nodes in correct order and adds assertion
Doesn't show prompt for scanner
Saves quoted strings properly
Allows interpreting of strings as values
Extra checks when converting strings to values
Allows strings in IN statements
Removes unnecessary node
Adds alwaysTrueOrFalse to ExpressionNodes
Added a simple README and a simple Perl script
Removed the nuspec file, as nubuild will not be submitted to nuget
An attemp to document `expired`.

The difference from `overdue` escapes me, since neither seems to have an affect on whether or why a sync is kicked.
Make a todo about showing deadlock information in payload.
Working curl plugin
updated api, adding documentation
Add Robust Bash Shell Scripts
Basic clean, ui layout.
Updated Blueprint to include precolborder
(http://blog.garethjmsaunders.co.uk/archives/2010/04/11/extending-colborder-in-blueprint-css/)
Merged change 8515e630d
use html ellipsis if possible (only a single char and therefore does not line break or mess up the strlen count for length)
coding standards
legacy support with test cases
correcting test
Fix STRICT warnings on PHP 5.4
Replace is_a with instanceof.
avoid duplication in returned results for habtm
Merge pull request #784 from ceeram/habtmmerge

avoid duplication in returned results for habtm
Revert "Merge pull request #784 from ceeram/habtmmerge"

This reverts commit fa5aa6278f8a6df688462581fd8e0373ac4cbd54, reversing
changes made to 88604ac757198dbb2db55bd69e91060904c7b442.
Add BlowfishAuthenticate adapter.
Merge pull request #775 from sitedyno/BlowfishAuthenticate

Add BlowfishAuthenticate adapter.
Merge pull request #779 from dereuromark/2.3-ellipsis-html

use html ellipsis if possible
avoid duplication in return value when saving habtm
Only split on ; for TABLE related statements.

Fixes #3142
Merge branch '2.2-habtmmerge'
Ensure = is removed from generated salt values.
Remove legacy test for all actions allowed (*) in startup and tidy code
Merge pull request #790 from thomseddon/2.3-authcomponent

Remove legacy test for all actions allowed (*) in startup and tidy code
Treat float numbers with trailing zeroes removed by PHP, accordingly.

Revert #2800 (28bd6880df2f4a6bd182bcb0f3a04dd5a1b64fad) regex changes. Also add more tests.

Signed-off-by: mark_story <mark@mark-story.com>
Fix failing tests in postgres.
make View trigger notice by default if elements are missing
and add elementExists() method
doc block correction
Merge pull request #994 from dereuromark/2.3-missing-elements

make View trigger notice if elements are missing.
Fix route commands in ConsoleShell.

Apply patch from 'Ludovic Pouzenc' to fix route features in the console
shell.

Fixes #3096
Refactor help to show up on console -h as well.
Don't destroy original themes
added missing citation to text and fixed indention
added pictures form francillion et al. and added some text on relay OTA/OTW
4.0.5 bump
CARROT-946: added Croatian mapping to Bing data source.
CARROT-954: Algorithms should accept alternative implementations of
IPreprocessingPipeline as an @Init attribute.

Squashed commit of the following:

commit d859a50369a5463f3f6abe339347c45ff43e9f19
Author: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date:   Wed Aug 22 10:43:04 2012 +0200

    Reverting lucene prep. context experiments.

commit 5acd99dba494332bd428b7c820c66835dd7320b5
Merge: e54a8c4 688c7a7
Author: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date:   Wed Aug 22 10:13:03 2012 +0200

    Merge branch 'master' into CARROT-954

commit e54a8c44977044f8c9e52c41bd1062c537a92d6a
Author: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date:   Tue Aug 21 13:01:52 2012 +0200

    Working simple clustering using lucene infrastructure.

commit cea85a63e29b59a53d0eeee959d7a9bedd96ca90
Author: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date:   Mon Aug 20 07:47:37 2012 +0200

    A simple test for alternative processing pipeline. Seems to work and set the attribute recursively.

commit c01e9912bc3a665c7852aa03ab89b11520040201
Author: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date:   Sat Aug 18 15:14:03 2012 +0200

    Corrected examples since preprocessingPipeline is no longer a hardcoded type.

commit 4f426aeed15946fecb99ba9c30f95ae833bae34c
Author: Dawid Weiss <dawid.weiss@carrotsearch.com>
Date:   Sat Aug 18 15:05:55 2012 +0200

    Replaced hardcoded values with attributes.
Merge branch 'master' into CARROT-903
Rough patch that adds an implementation of IPreprocessingPipeline on top of an Analyzer. The analyzer must support several attributes (positions, offsets, CommonWordMarkerFilter). Some of these are Carrot2 specific and will require modifications to typical token filter chains. One remaining thing is to use a custom input tokenizer because Lucene implementations strip punctuation.
More builtins (int, str, chr, ord), in evaluator only for now.
users can post now to post!!!
and timezone in now pst!
Added semicolons after all the functions.
Merge branch 'master' into entityExample

Conflicts:
	js/shmup/game.js
Added missing semicolons.
Removing mailplane customizations
Printing the number of tests passed when 'all' tests are successful

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
Fix typo in README

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Fix ceph-fuse example

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
New kcon_most task that enables most ceph kernel logging

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
New knfsd task that does an nfs server export
    Ability to specify options
    By default only export to current hosts

Fixes: 3245
Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
New nfs task that performs NFS client mount of export (see knfsd)

Fixes: 3245
Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
valgrind: add strptime suppressions

Precise's strptime triggers valgrind false positives.

Use ship_utilities to push the valgrind.supp file over, which is a bit
slippy.
kernel: reset to remote firmware branch; don't pull

Pull might merge if upstream rebases.  Just make our branch match the
remote one.
kernel: kludge around mysterious 0-byte .git/HEAD files

No idea where these are coming from, but they break nodes with behavior
like

ubuntu@plana08:~$ sudo install -d -m0755 /lib/firmware/updates && cd /lib/firmware/updates && sudo git init
Reinitialized existing Git repository in /lib/firmware/updates/.git/
ubuntu@plana08:/lib/firmware/updates$ sudo git --git-dir=/lib/firmware/updates/.git config --get remote.origin.url >/dev/null || sudo git --git-dir=/lib/firmware/updates/.git remote add origin git://ceph.newdream.net/git/linux-firmware.git
ubuntu@plana08:/lib/firmware/updates$ cd /lib/firmware/updates && sudo git pull origin master
fatal: Not a git repository (or any of the parent directories): .git

where the .git directory looks like

total 32
drwxr-xr-x 7 root root 4096 2012-04-10 12:52 .
drwxr-xr-x 3 root root 4096 2012-04-06 13:54 ..
drwxr-xr-x 2 root root 4096 2012-04-06 13:54 branches
-rwxr--r-- 1 root root  236 2012-04-10 11:33 config
-rw-r--r-- 1 root root    0 2012-04-10 12:52 config.lock
-rw-r--r-- 1 root root    0 2012-04-06 13:54 description
-rw-r--r-- 1 root root    0 2012-04-06 13:54 FETCH_HEAD
-rw-r--r-- 1 root root    0 2012-04-06 13:54 HEAD
drwxr-xr-x 2 root root 4096 2012-04-06 13:54 hooks
drwxr-xr-x 2 root root 4096 2012-04-06 13:54 info
drwxr-xr-x 4 root root 4096 2012-04-06 13:54 objects
drwxr-xr-x 4 root root 4096 2012-04-06 13:54 refs

Hopefully someone can figure out what is causing this and revert this
later.
add: static file test_play.html for Server Monitor System
dayend

Signed-off-by: Chan, Roy KM <Roy.KM.Chan@pccw.com>
Update: API, getMessageDetail is completed

Signed-off-by: Chan, Roy KM <Roy.KM.Chan@pccw.com>
update: disable the schema update.

Signed-off-by: Chan, Roy KM <Roy.KM.Chan@pccw.com>
Merge remote branch 'choose_remote_name/master'

Conflicts:
	app/controllers/TargetMessage.java

Signed-off-by: Chan, Roy KM <Roy.KM.Chan@pccw.com>
bug fix: merge import statment

Signed-off-by: Chan, Roy KM <Roy.KM.Chan@pccw.com>
Merge branch 'master' into boris

Conflicts:
	app/controllers/TargetMessage.java
finish broadcast, :(
Allow space before key names in bibtools.py (by request of Simon Carrignon); primarily to improve compatibility with kbibtex, which puts space in before keys for some (silly?) reason.
Merge branch 'master' of git://vim-latex.git.sourceforge.net/gitroot/vim-latex/vim-latex
pass tests.bulk_docs.js tests
Get a good paging feel via scroll durations
Moved app.js content to chiaka.api.js and content.js
adding error handler for games list
Merge remote-tracking branch 'origin/emir' into Chedi
Minor html fix
Change direction arrow for connect header
opinion should work
removed command bus
Methods to apply names to created channels
updated commandchannel
changes due tue moving some files
renamed unsafecommandexecutor
Implemented dispose methods and added context creation by config to almhirtcontext
Added trait AlmhirtEnvironmentTestKit
imlpemented almhirtcontexttestkit and added a devnullrepositoryregistry
Fix : Webui, move the show/hide tool bar button on the left part of the page, just above the tool bar.
Fix : test_loggin under python 2.4 and 2.5, NamedTemporaryFile do not manage delete parameter.
Fix : make test_logging inherit from common shinken tests, so we got the overloaded 2.7 only method for unittest.
Correct livestatus commands table. Fix #520
(Fix by: Franky)
Scheduler.py - Remove stack traces on warnings

It is normal to have connection failures via network.
Don't do a stack trace for a run of the mill warning.
Remove stacktrace import.
Added some inline specs, made adjustments
batch push, include push id
destroy followups properly
position changed on slogan to 3.6875em
worked on responsive; width added to table, checkout-steps, copyright, .item
made buttons hide
made minor changes to css file
uptime conf
zigzag problem, checking queues
render empty cell for nil vals
make render-rows more readable
see if examples look better in standard pre
Added new interface CacheWithTeardown which cache can optionally implement to be notified when Railo no longer needs the cache.  The teardown method should be used to disconnect network connections or any other clean up tasks.
Fixed background of sidebar field editor.
Merge branch 'master' of ssh://github.com/OpenEmu/OpenEmu
Merge remote-tracking branch 'upstream/master'
Update FB Alpha core to 0.2.97.26
More work on the Namespaces guide
More work on the Namespaces guide
Item7080: Sanitize MAKETEXT variable -- adding latest Locale::Maketext to TWiki's CPAN collection

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@24430 a00a5322-12db-0310-a70b-8735589c885e
Item7080: Sanitize MAKETEXT variable -- adding latest Locale::Maketext to TWiki's CPAN collection - updating manifest

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@24431 a00a5322-12db-0310-a70b-8735589c885e
Item7080: Sanitize MAKETEXT variable -- oops, there is an issue in case the Locale::Maketext module is not available - commenting out for now

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@24434 a00a5322-12db-0310-a70b-8735589c885e
vital signs frequency
iniial extract from svn repo
add support of custom logical volume name
Merge pull request #262 from yudoufu/master

[proposal] support custom logical volume name.
Changing the naming of foreign key columns.
MessageFormatter: do not match names within URLs
Fix shadow build
configure: pick qmake-qt4 if qmake doesn't exist
configure: run qmake recursively

To ensure fresh makefiles across the whole project tree
pg030 - Initial Commit
beta
同步诚信和专业排行
beta2版，支持从setting。xml读数据库链接
fix for inject_log_old
Merge pull request #27 from corristo/master

async xml parsing + memory leak fixed
Cleaned up some code, fixed a couple warnings, and upgraded to the 10.7 SDK.
Formally "cutting" a new release of the framework.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	XMLRPCEventBasedParserDelegate.h
Plain layout & link colour tweaks
Begin debugging dom3d.
Set default shell. Enable line number globally.
Fix bug
Add classes
Merge branch 'master' of github.com:crazy2k/tp-isw2
Update acceptance criteria
Update multiple configuration

Vim, xmonad, mpd, zsh
Add suffix to README so GitHub renders it.
added wordnet for noun, verb word judement
added return value
Ignored ds.store
Add lab 3 instructions
Add lab 3 exercise 1
Add lab 3 exercise 2
Add lab 3 exercise 3
Started fixing up gem build, for #63.
Only do Git tag/push on MRI.
Added build and man page docs.
tweaks; added shortcat key
Took care of special case in Beam3D frustum clipping
Allow all hosts on SSL connection.
Merge pull request #10 from cureos/master

Pixel Data handling for 32-bit integers, corrected Get method handling and DicomFile.Open(Stream) overload
update README and ChangeLog
Merge remote-tracking branch 'origin/master'
rename RescaleLUT to ModalityLUT
add support for SIGMOID VOI LUT function
better handling of size and position of image display window in DICOM Dump
updating the p3 file

At first I did this without Git, but will use the repo instead.
I might later do this in PHP.
use getTitle method
use addRepo for indexing new repositories
clean up code
obj-c in emacs, and basic firewall template
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Jurgen made implode to set/listtype more robust
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from Y3PP3R/master

small implode fix by Jurgen
auto source .vimrc.after if modified
wtf dont reset my branche bitch
try to auto-import oomatrix...
API playground: gibbs.py
Major bugfix eventhandling maphandling
Add sign in form

The user is now also automatically signed in after creating an account.
add click
count point in zone
Merge branch 'master' of http://github.com/dalvik/DrawView
remove crap apps
Adding uncertainty to drift computation. Drift subtraction is slower now.
Compute uncertainty (std) in drift, and show it in plot.
Added solarized for console2
Properly fixed test failure and line numbers in uselessCallsEmpty error
Fixed #3935 (False report for accessing array out of bounds after casting to short)
added rotation and fullscreen
Removed HTTP_HEADER_*
Deleted StreamHolder_t
Initial Commit on CodeChef project
Signed-off-by: Darshit Shah <darnir@gmail.com>
homepage updates. Add footer
a
Merge branch 'master' of github.com:david4chao/Test
Merge branch 'master' of github.com:david4chao/Test
Merge branch 'master' of github.com:david4chao/Test
Merge branch 'master' of github.com:david4chao/Test
...
Update notifications.py to support showing followers & followees.
Update sns/models/message.py
adjust spec for range testing
gem therubyracer causes some probs on our CI, try without it...
Re-did tests. Minor tweaks. Still not sure about 24h midnight. More tests to do.
Added a particular case of compute covariance method for pure AR models. This
method enables to compute the covariance matrix using the white noise
covariance matrix of size p
Removed some useless boolean variables and added verbose accessors
Renamed the logLikelihhod function and completed the method. This enables to
compute the main factor of the likelihood function
Completed the ComputeObjectiveAndConstraint method by setting the constraints
on AR values, MA values and covariance matrix
Completed the build method by launching the cobyla algorithm
Made some cleaning and fixed some minor bugs
Added ARMALikelihood library tests
sitemapping
fixed descriptions
Pass LDAP connection params by property resource insted by system properties
enable to nullify match by BasicQueryTask#adjust(match)
Merge branch 'master' of github.com:dcm4che/dcm4che
Support eventual consistency to allow greater micro-benchmark performance and 100% availability as much as possible.
Merge pull request #26 from afeinberg/patch-1

Support eventual consistency
Add -E,--environment flag for virtualenv location.
Merge pull request #7 from nimbis/venv

Add -E,--environment flag for virtualenv location.
Add stop_grace_time to bluepill config. Fixes this error message:
Config Error: Stop_grace_time should be greater than the sum of stop_signals delays!

Changed bluepill spec example files to include stop_grace_time
Merge pull request #193 from pat2man/patch-1

Add stop_grace_time to bluepill config
Progress on parser.
on_request & on_response callbacks for host
cleanup examples
Fixed issues with internal client in modules
Updated history
Merge remote-tracking branch 'origin/master' into 0.7
Added get songs
Resolving conflicts
Fixed it
further fixes for #26
even further fixes for #26
closes #8
closes #33
add italics to the name of the UT on Rails Tutorial
change background color of link details (comments and votes) on the home page
explicity close the person files after sorting
PT-41026227 - Allow CSV writer to accept ; as delimiter
* Licence moved to LGPL