labofsahil/github-event-dataset-2012 huggingface dataset:
make prefixes for all metrics configurable
Merge branch 'configurable-prefix' of https://github.com/Dieterbe/statsd into configurable-metric-namespace

Conflicts:
	backends/graphite.js
	exampleConfig.js
modify key namespacing to be easier to configure

This makes some changes to what the default key namespaces are and how they are
configured. Basically it puts the config under the graphite key and doesn't
need the user to take care of where dots are set.
fix the tests
Merge branch 'master' into configurable-metric-namespace

Conflicts:
	backends/graphite.js
	exampleConfig.js
add a flag for namespacing backwards compatibility

This introduces the `graphite.legacyNamespace` boolean flag which can be used
to maintain backwards compatibility to how stats are sent to graphite.
update tests to reflect non-legacy namespace
add tests for graphite legacy namespace
add set type to configurable namespace
Merge branch 'master' into configurable-metric-namespace
Updated stats.js to delete counters

Counters are now deleted after being used, not set to zero.  This solves
some issues with high load on Graphite and certain graphing functions
which require null instead of 0 counters.
Merge branch 'null_counters' of https://github.com/ReturnPath/statsd into nullcounters
Update stats.js

Changed from delete to undefined, per some info on delete from Mozilla https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Operators/delete

This keeps the array element there, just sets it's value to undefined.
Update test/graphite_tests.js

Updating the test to work with new null count change.
Update stats.js

Added a config option delete_counters with a default: false to control the behavior of the counters metrics to delete.
Tests for Delete Counters Config

Added tests for the delete counters config change.
Updated the example config docs with the new option
Adds sets for Ruby example + Whitespace cleanup
Merge pull request #195 from suvash/add-sets-example

Adds sets for Ruby example + Whitespace cleanup
Merge branch 'master' into configurable-metric-namespace

Conflicts:
	backends/graphite.js
Switching back to suc again
avoid using sys.getrefcount() where possible (PyPy doesn't have it)
Added the change from SteamShortcutManager/c209ebb
Created all of the method stubs for the general flow of this program. See ice.py:main() for details
renamed setting, automatically disable MRT when unsupported
Changed ReadMe and added another idea.
Minor additions
Added call for flickr
moved policies.sparql to sparql package
ich weiss nicht weiter...
Makefile cleanup. Only thing surviving border feature (not present since urxvt explicitly disables borders)
created new column, last_post_id, to topic model. finished ordering of topics based on latest posts
changed depth for hvc from 5 to 3
solved first problem without loops
less random comment
now works correctly with type annotations
Provided proper arguments to monit_handler.
publish version 0.1.1
charon deploy: Add option ‘--max-concurrent-copy’ to limit concurrent nix-copy-closures
Do a sync before switching to the new configuration

"nixos-rebuild switch" does a sync before activating the new
configuration, so it makes sense for Charon to do the same.
task #00016-Provide_ajax_user_login: MInor fix
Merge branch '00016-Provide_ajax_user_login' into develop
fix code: remove dmp() from the form validate function
Merge branch 'fix_code' into develop
add string values
Virer coding utf8
Use xrandr instead of disper
Generalize to multiple displays
Update notes for submitted changes

* Fix FWNX-909 (and Xamarin 8907)
Uppmuntra inte ändringar i skriptet
Byt skript-adress till master på GitHub
Bumpa till ny version
Fixes an error related to strftime
Merge branch 'master' of github.com:simsong/dfxml
Pataisitas README.md
Moving methods around shared analyses to a separate trait.
#148 After animation is stopped the final redraw has to be called...this fixes it.
Merge branch 'develop' of https://github.com/siroky/Payola into develop
Added extractTextPDF script
basic bearing functionality
Merge branch 'master' of https://github.com/sjrct/Frosk64
working rusk and bearing
"Added MedlineDataframe method"
bozza ddt
aggiunta tab dati per stampa doc (ddt)
focus solution after win
an ugly commit with some quick-n-dirty changes to sdm
Added fullscreen toggle button
merged in changes from torbjokv
sidepane design change
commit, push, remove local
added quit support
make Plus and Times precision aware
Extra (failing) tests for Times formatting
markdown language -2nd attempt
Added parsers for `ranwens.com'.

Signed-off-by: Snakevil Zen <zsnakevil@gmail.com>
You can choose any food, not only favourites now.
댓글 좋아요 기능 추가
글 추천 알림 완료
Funcao para formatacao de data
PartitionAllP renamed, doco'd
Extended message functions.
Added kick and preg_match() to chanops
Test new example
Suppress spurious warnings in our $:: (fixes #127)
Improve quantifying-nothing check (fixes #128)
Adding logout and login pages
Adding index view
delete link for documents in event
Merge branch 'master' of github.com:spanner/droom
Added use case class SupportMemberResolveTicket.
Merge branch 'master' of https://github.com/sparkplug/DTS.git
created a jquery ui dialog
deleted irrlevent folder
fix 3296
-
AAI: fix uninitialized var
AAI: fix SIGFPE
AAI: fix some compiler warnings (unused parameters, initializion order, unused functions)
HAMT: choose spin-dir based on id (already random)
add assertion in TeamHandler.h
fix bug in /aikill (thanks kloot)
Shard: update
misc: give pathfinder debug-data drawing its own shortcut (alt+p)
merge develop/
Fix mutex
Added dresser gem and paths reorganised as well
Discipleship stuff
starting off
more
Initial Commit for baselib
changed README to markup language
moved into wip/ as I've not been suceeded to build ghc-press
added
moved into wip/ as I've not been suceeded to build ghc-press
Entries, listeners and broadcasts.
Added comment to rom_copy
cakephp blog tutorial is done!
#18274- Always allow updates, replies, or questions

Adding alert on questions, +1 and comments
Merge branch 'master' of git://github.com/worklist/cp_ios into 18145
Merge branch 'master' of git://github.com/worklist/cp_ios into 18145
update TestFlight SDK, fix incorrect resource placement
disable TestFlight ugly in-app updates
fix a crash for user teleporting location
Merge pull request #68 from stojce/18145

Code Review for Job #18145
fix double username on checkin posts
make check in two words
FeedViewController doesn't need to listen for userCheckInStateChange
Merge pull request #69 from birarda/18280

Code Review for Job #18280
Merge pull request #70 from birarda/18361

Code Review for Job #18361
Looks good. 
Merge branch 'master' of https://github.com/worklist/cp_ios into 18337
Merge pull request #71 from birarda/18337

Code Review for Job #18337
combine error handling in CheckInDetailsViewController for session and parse errors
Merge branch 'master' of https://github.com/worklist/cp_ios into 18365
Merge pull request #72 from birarda/18365

Code Review for Job #18365
Merge branch 'master' of git://github.com/worklist/cp_ios into 18273
Revert "Showing the list!"

This reverts commit b469169bd3780010ede914c4529dea6004727c36.
add Autohotkey folder
added comments
Merge branch 'master' of github.com:sumt/asciigen
Inital add

Added my initial version of HexBrightFLEX
Working chat!

That's right, boys and girls.  It works.
Start of a basic location class.

This will soon handle people joining and parting a location.
Support choosing a port on the command line.

Just put a number as the only CLI for now.  Useful for me testing
changes now that I'm actually keeping the server running.
Rudimentary use of rooms.

Chat now tells you what room you're in.
Handle disconnects properly with rooms.

I wasn't updating the fact that someone left the room when they
disconnected.  This was causing weird hangs because there were
references to players that no longer existed in the room lists.
Make blank emote not crash the server.

Oops.  There's no .emote.
Actually use rooms now.

You can move around and the server will instantiate new rooms for
you.  I need to write a 'reaper' at some point that axes rooms
that are empty.
GeoLive controller added, minor fix on views
Make ToC on right sidebar float while scrolling.
Rebuild HTML
Rebuild HTML
rebuild HTML some more.
Fix write status check. Return type is jboolean.
Some much needed cleanup - including logging with SLF4J
topic 2 is complete
fixed csv reader
matrices
delele log/development
delete log
fix downscaling rate presentation and calculation
Rebar: fix repositories urls.

Closes #1
Implemented TagUnion::properties() and made Tag::*properties* virtual.

This allows to remove several default implementations in types using
TagUnions.
Add TagUnion::removeUnsupportedProperties, further reducing SLOCs. :-)
Update NEWS
Parse covr atoms with type 0 (fixes issue #84)
Add a tool to inspect audio files, only MP4 is implemented for now
Build also examples
Revert "Add a tool to inspect audio files, only MP4 is implemented for now"

This reverts commit 45b0279b411958d8fcc1428dc38084f351ae4b80.
Merge branch 'master' into taglib2
Revert "Revert "Add a tool to inspect audio files, only MP4 is implemented for now""

This reverts commit c6f7ad3e83e6888c448cac2d1ac242181554623f.
Make the toString() method virtual
Add toString() for Vorbis Comments
twitter アカウント情報更新スクリプト初期コミット

Signed-off-by: nanashi <nanashi.hatch@gmail.com>
初版
Merge branch 'master' of github.com:tangxm/kukuma
fix subtle bug when player presses both left and right at same time.
variable renaming
goci-pussycat: triggering filtering event whenever bioportal widget changes or loses focus
Always run start-stop-daemon with the --quiet flag.  We do our own
start/stop logging.
making utc explicit
fix:show results
Merge branch 'master' of github.com:tehPlayer/zpi
Merge branch 'master' of github.com:tehPlayer/zpi
fix- show results
port number can be passed through spec
Merge pull request #12 from teleportd/portfix

port number can be passed through spec
fix proxying to https
plug stub generation to the Makefile

The Makefile is now fully functional, forcibly packaging and running unit
tests for all GNU Smalltalk packages so that a single make is enough to test
everything.
add ORBitORB>>bootstrap:with: and use it

We now capture originating ORB in every CORBAObject. This can be too
expensive, but it will do for the PoC.

Also implement #findLog:
スペル補完
Another poor release

Everything re-written from scratch
No commenting
Pefroms basic execution of inbuild commands
add text shortener
Update examples
Document the Maybe instance for From/ToField
まつもとさんを入れた
Use the current year for patron orders
Temporary fix for stuttery playback of AVI files over Storage Group.

This is a reverse of ffmpeg SHA1:8df774be88c347c40f1b2411ed9e391dfec0ebb7
http://git.videolan.org/?p=ffmpeg.git;a=commit;h=8df774be88c347c40f1b2411ed9e391dfec0ebb7

This is not a proper fix. It only reveals an issue with myth Storage Group file ring buffer.
With this ffmpeg change, some AVI files are detected as non-interleaved and the readahead thread starts to pull MB of data which saturates 100Mbit/s link causing the video playback to stutter.
(cherry picked from commit f1540fe05ee15d1f53fe30e137931b185b791821)
Revert "Temporary fix for stuttery playback of AVI files over Storage Group."

This reverts commit c21e9beb16583f640e7457e798c047b3af05cf15.
Revert "Revert "Temporary fix for stuttery playback of AVI files over Storage Group.""

This reverts commit f1cc7e3e4410195aeb6c7da3bba7dc44830bdc4e.
Was never supposed to commit this revert
Speed up and reduce temporary space of time search a lot.

By factoring out the description into a super query the performance can
be greatly improved (e.g. from 2 minutes to 2 seconds)

Thanks to sphery for inspiration by [d9fb21853f] and justinh for testing
and fixing my braino with the column order.

Fixes #10023
(cherry picked from commit c0c47344879d3467cfea62938a33e70278252b36)

Conflicts:

	mythtv/libs/libmyth/programinfo.cpp
Fix copy/paste error in MythUIType::AdjustMinArea(). Coverity 746772
Fix copy/paste error in MythUIType::SetMinArea(). Coverity 746771
Merge branch 'fixes/0.26' of https://github.com/MythTV/mythtv into fixes/0.26
Add more pretty print instances.
Add more MonadIOException instances.
Improve the pretty printing of exception.
Make compressions more lazy to allow more sensible errors in the compiler.

Before, P = normal(P) would result in a stack overflow since, when
evaluating normal, we would firstly match the VProc of the argument. We
now defer this until we actually require it.
Add a finally function to the exception handler.
0.1.6 release
Transform command into lower case
Load config & plugins before console start
Fixed layout of command list
Added "env" variable to global variable
Simplify code
Transform config.exclude_generator into string when it is not array
Modified model
- Added "source" property (original "path" property)
- Modified "path" property (original "permalink" property)
- Modified "permalink" property to full url
Expose render function
mmc: Add a forgot password feature to the MMC login page (refs #1687)

This feature can be enabled per server.
Users must have the ACL for the reset password page.
web: Add the forgotPassword option in the default configuration (refs #1687)
doc: add documentation for the usertoken hook (refs #1687)
mmc: Fix user token field (refs #1687)
mmc: default page is the first visible page for the user (refs #1687)

If auth_method is token resetpasswd is the first page. the passwd page
is not displayed.
packaging: create /var/log/mmc and /var/lib/mmc with autotools (Closes #1740)
audit: format audit record for the python logging system
core: add syslog logging config for the audit framework
core: don't propagate audit logging to the root handler by default
audit: add an ID to audit python logs and a STATE
userquota: Fix typo (Closes #1741)
login: Use original language names on the login page (Closes #1594)

Also select correctly the language according to the browser language
if no cookie is set.
login: add a back button on the forgot password page
login: Fix support link
login: don't use a fixed height for the login box
login: Change passwrd reset message
base: restore status methods
tools: handle non-posix users
tools: use the new mmc.client.async client
async client: store correctly the session cookie
Another sample (spec and readme)
A better way for slurping the PKGBUILD file.
F keys
added css layout
added typography styles
Added LEFT JOIN on SALESMAN for Co2
Added the LEFT JOIN on salesman file for CO2
Use async version of chmod.
Add link command, change cache dirs.
Small tweak.
オブジェクトの配列から、プロパティの値が各要素の中で最大 or 最小のオブジェクトを返すメソッド追加
配列の連結をするメソッド追加
bind関数で作った関数に引数を渡せるようにした
Merge branch 'master' of github.com:u1tnk/kah.lua
iac: add missing dependency
vf_libopencv: add missing headers.

Fix build after b74a1da4.
audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
audioconvert: add a function for getting channel's index in layout
audioconvert: add a function for getting the name of a single channel.
audioconvert: add a function for extracting the channel with the given index
Bump lavu minor and add an APIChanges entry for audioconvert functions.
avconv: multithreaded demuxing.

When there are multiple input files, run demuxing for each input file in
a separate thread, so reading packets does not block.

This is useful for achieving low latency when reading from multiple
(possibly slow) input streams.
libmp3lame: add missing layout terminator

Signed-off-by: Anton Khirnov <anton@khirnov.net>
dct-test: fix alignment in ff_prores_idct_put_10_sse2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libmp3lame: add missing layout terminator
  avconv: multithreaded demuxing.
  Bump lavu minor and add an APIChanges entry for audioconvert functions.
  audioconvert: add a function for extracting the channel with the given index
  audioconvert: add a function for getting the name of a single channel.
  audioconvert: add a function for getting channel's index in layout
  audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels
  vf_libopencv: add missing headers.
  iac: add missing dependency

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	libavcodec/libmp3lame.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
adding Matlab code
- Added the MySQLdb Python package to the source tree.
Need ability to get version information.
hyhull-fixtests: More tests fixed
add device configuration
modified:   Makefile
	modified:   hash.c
	modified:   include/config.h
	modified:   include/st.h
	modified:   include/stdtypes.h
	modified:   include/utils.h
	modified:   queens.tig
	modified:   st.c
	modified:   tiger.l
	modified:   tiger.y
	deleted:    tiger_parser.y
Small change to ROC curve.
Fixed bug in multititle patch
fixed some of errors detected by Dr. Ramsin
Fix funciones trabajando. Ejemplo Fibonacci 0 a 10
Finished removing the final traces of the propBag, and moved everything over from store.js to villo.store.
Fixing the ghdl dependency on libiberty.
Setting the dependency of ortho-lang.c on TM_H better.
Updates to the buffers in the processing chain.
"usage" value should be passed to OptionParser.
remove longName from RuntimeInfo (irrelevant)
Start emacs-server if running in window mode
Increase ido limit
Update to python-mode 6.0.8
Added Bootsy FTW!
adding some FLC exercises
Update script and docs for single-user installation
figuring out how to add the cap environment
JP Flori's "Attempt to make build system more modular"
Split up config params to avoid newline issues.

Conflicts:

	configure
Debugging features (markers in gutter, syntax highlighting, hover help)
Error handling on code page
Merge branch 'master' of https://github.com/web-cat/pythy
Better error handling
java: random promise ideas
Small fixes, tests pass, release as 6.0.0.
Fix pagination button wrapping in the CSS.
replace transform with top and fix shoppingcart bug
shoppingcart is ok
Adds showUsage to searchSherdogFightFinder
Class with basic operations of rational number.
moved everything into functions
Simplified the way that the uploads are done,
Using counter to give parsing results to correct var
Removed redundant --thumb
Scrot command is always the same, only the strings change from empty to
    whichever option the user selects.
Reworked to avoid/minimize uninstall surprises.

Many small improvements, and several "big" ones,
including the move of geocouch build files from couchdb Cellar into geocouch Cellar.
This change reduces the mixing of geocouch into couchdb.
The caveat documentation reflects this change in an update to the ERL_FLAGS instructions.

The geocouch.ini file still hooks into couchdb initialization directory by necessity.
The uninstall documentation now specifies how to remove the geocouch.ini file for uninstall.

The tests still hook into the couchdb test directory by necessity.
The uninstall documentation now recommends uninstalling both geocouch and couchdb
to remove any dangling tests from couchdb's couch_tests.js file, and then
reinstall couchdb fresh.

A variety of cleanups were applied along the way.

In sum, as mentioned before, since geocouch is a superset of couchdb,
uninstalling geocouch should be rare and unnecessary.  But in the interests of least surprise,
these changes minimize uninstall complications in the rare case someone chooses
to keep couchdb while uninstalling geocouch.

Perhaps some changes to couchdb will make a modular approach possible in the future,
but for now I believe this approach is practical and avoids unpleasant surprises.
Checked for array boundary.
implement repository browser and some various enhancement
Clear a bot's local list setting if it matches the global (#36)

This is due to the default (global) being added when adding to the list.
So if after removing from the list, it now matches the global, it should
do the inverse, and reset to match the global via being cleared.

This is mainly to aide in groups auto adding 'main' and auto removing
'main'
Merge branch '36-groups-fixes' into next

* 36-groups-fixes:
  Clear a bot's local list setting if it matches the global (#36)
arvind: checking in sample usage of user object from gtdirectory
RestView extracted. Login view cleaned.
Switch to the Persona observer API.
Corrected redirection

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@127514 a5903396-d722-0410-b921-86c7d4935375
adding gadget gen capabilities

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@127515 a5903396-d722-0410-b921-86c7d4935375
issue fixed to run with the stratos

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@127516 a5903396-d722-0410-b921-86c7d4935375
GD related fixes during hot update of apps

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@135884 a5903396-d722-0410-b921-86c7d4935375
adding clone mediator test cases

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131581 a5903396-d722-0410-b921-86c7d4935375
prodproduct-service merging : fixing documentation module.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@128410 a5903396-d722-0410-b921-86c7d4935375
prodproduct-service merging : fixing Identity specific features.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@128411 a5903396-d722-0410-b921-86c7d4935375
prodproduct-service merging : fixing Identity specific features.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@128412 a5903396-d722-0410-b921-86c7d4935375
Removing GApp features from Hosting products, refer https://wso2.org/jira/browse/CARBON-13661

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@133982 a5903396-d722-0410-b921-86c7d4935375
Fixing charting issues

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@133983 a5903396-d722-0410-b921-86c7d4935375
changing the context help pages of add service.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130694 a5903396-d722-0410-b921-86c7d4935375
changing the context help page of add schema page

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130695 a5903396-d722-0410-b921-86c7d4935375
changing the context help pages of add wsdl page.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130696 a5903396-d722-0410-b921-86c7d4935375
Adding emma to tests

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130697 a5903396-d722-0410-b921-86c7d4935375
changing the context help page of add policy

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130698 a5903396-d722-0410-b921-86c7d4935375
Alert messages are added  

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130699 a5903396-d722-0410-b921-86c7d4935375
partial fix for CARBON-13409

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130700 a5903396-d722-0410-b921-86c7d4935375
logger fix

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@125399 a5903396-d722-0410-b921-86c7d4935375
Adding the maven2 build for app factory.


git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131638 a5903396-d722-0410-b921-86c7d4935375
[Fix] [REGISTRY-928] Don't allow to add same artifact twice.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131639 a5903396-d722-0410-b921-86c7d4935375
Adding the maven build component.



git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131640 a5903396-d722-0410-b921-86c7d4935375
add  啊phpunitSuit
add phpunitSuite
Collisiondetection (funktinoiert aber noch nicht fuer schnelle Autos
wegen 45 Grad)
added portfolio link to the navigation bar. fixed wrong color problem of total gain
Multiple Layouts

complete restructure of o3o, this allows the application to use
different windows as mainwindow, as long as they have the same methods
and objects
drag scrolling of tweets works now

needs some fixing though, it has some wierd behavior
bracket fix

lol that was a stupid one
hurr cleanup
design stuff, replys, retweets, mentions.

mostly trying to conform  to twitters display requirements, far from
done.
drag scroll is still iffy(first drag scroll works, but on the second it
shoots back to the top of the list)
some optimisations and started work on name popup

also replaced libraries with the latest, json error no longer occurs
when debugging.
added direct messages, removed tool top
Initial commit
Initial commit on locallocal : )
Merge branch 'master' of github.com:xelinorg/init
some small additions on dismes.brst
Merge branch 'master' of github.com:xelinorg/init

Conflicts:
	incub/dismes.brst
trying to commit
New alias psa stands for "ps aux"
Disable source bashrc_oracle by default.
Adding Thumbnail() method.
Work on mode 8
Continue work on mode 8
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Core/Dialog/SavedataParam.cpp
merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pspautotests
Copy right size of save request.
sync submodules to latest
Cleanup and fix mutex init, no need for a flag now.
Always create CoreTiming timers during kernel init.
Make sure threading state is cleared on shutdown.
Properly clear interrupt state on shutdown.
Fix random modules not reseting on shutdown.
Cleanup some state on reset in the GPU code.
Properly cleanup the jit on reset.
Switch the Windows RC file to UTF-16.

UTF-8 not supported, and the encoding got messed up.
This should keep it correct.

Contents not changed.
In Windows, disable run/reset/pause when closed.

Saw this a lot while testing and couldn't help but fix it.
I know this is probably going away soon.
Merge pull request #245 from Xele02/master

Save Update
Oops, don't need this here after all.
Deallocate properly in shutdown, not in init.
No longer need this forward decl.
github is so stupid!!
use bind values for join columns

This is a backport of 4bc2ae0da1dd812aee759f6d13ad428354cd0e13.
It fixes bug #7950.

Conflicts:

	activerecord/lib/active_record/relation/calculations.rb
	activerecord/lib/active_record/relation/finder_methods.rb
Test/changelog for has_many bug on unsaved records

See issue #7950.

The previous commit fixes this bug, and is a backport of
4bc2ae0da1dd812aee759f6d13ad428354cd0e13.
Fixes issue #6251

Plugin generator crashes when using the --dummy-path option

Code was assuming the application name in `config/application.rb`
was module Dummy.
backport #8139, `plugin new` adds dummy app tasks when necessary. …
The `plugin new` generator always adds the dummy app rake tasks,
when a dummy app was created.

Closes #8224

Conflicts:

	railties/CHANGELOG.md
Merge pull request #8227 from senny/backport_8139

backport #8139, `plugin new` adds dummy app tasks when necessary
Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintext

Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/test/template/template_test.rb
Merge pull request #7983 from georgebrock/bug7950-squashed

Backport 4bc2ae0 to fix #7950

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/calculations.rb
Fix bug when url_for changes controller.
Refactor Generator class to not rely on in-place editing the controller
Add changelog entry for #6003 backport
Remove the git option from ruby-prof gem pointing to wycats repo.

According to him, at one point his fork was the one that had the call
stack printer, and it's in the main repo now.

[ci skip]
Upgrade mail dependency to 2.5.0
Upgrade mail dependency to 2.5.2
backport #8262, require bundler groups to include rake-tasks in engines

If you generate a full engine, this will include rake tasks from
your gem under the `app` namespace. For example if you have a dependency
on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec`

Closes #8229

Conflicts:

	railties/CHANGELOG.md
Merge pull request #8271 from senny/backport_8262

backport #8262, require bundler groups to include rake-tasks in engines
Merge pull request #8258 from kommen/eager_loading_with_select_test2

Add test to ensure preloading works as expected with "group", "select" and "includes".
Conflicts:
	activerecord/test/cases/relations_test.rb

Chery-pick a739340d3c9e66814429af6f3f410c01ff86810a:
Ensure ordering to make the test pass with postgresql

Conflicts:
	activerecord/test/cases/relations_test.rb
Be a bit less conservative with mysql in adapter

This will allow the new mysql 2.9.0 to be used, fixing our test issues.
Merge pull request #8276 from pwnall/pgsql_text_limits

Postgresql doesn't accepts limits on text columns
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
Added CFB mode and drafted CSPRNG, improved test unit and do and doc.
[ios] Disabled Web API response logging.
luaA_window_get_opacity: Always return a number

What's the point of distinguishing between "opacity 1" and "no opacity set"?
This commit makes awesome handle both cases identically.

Signed-off-by: Uli Schlachter <psychon@znc.in>
drawable: Add property::surface

This new property is used for fixing some missing redraws that the old code had.
Those could be seen via awful.menu. Open and close a submenu repeatedly and the
submenu will appear black.

Signed-off-by: Uli Schlachter <psychon@znc.in>
Updated to the latest version of jquery + ui.
delete test branch
delete test
use box2d damping instead of manual velocity adjustment
adjust README
Merge pull request #94 from PunchWolf/rapanuidev

use box2d damping instead of manual velocity adjustment
Support the setting of multiple gids in the executed process
Pre upload commit
Song title ellipses show up in middle for easier song identification
Client sends upvote if user tries to add a song already on the playlist
Added toolbar with button for Player Mode
Removed toolbar for now
fix
fix #373
Added Youtrack Integration Extension for Chrome
application gae basique
Plural support - shortcut keys implementation
work in progress: implementing autosize in textarea
increase replace-all button width
Moved Application.xhtml to resources folder
Added pseudo frame style option
Merge branch 'master' of github.com:zdavatz/ydocx
Naming: changing seqn => inum
Prevent connection starvation

When removing a pipe from the lb or fq component,
make sure we do not remove another pipe from the active set.
Merge pull request #355 from hurtonm/fq_lb_fix

Prevent connection starvation
Fixing incorrect argument order on va_start

Compile was failing on the monitor_event function function due to the
va_start params being switched.
Incorrect var name in monitor_event

The call to the va version of the function was using 'event' instead of
'event_'
Incorrect function name in socket_base

VA specific monitor event in socket base was named monitor_event rather
than va_monitor_event
Remove early return on terminated state

Code as stands breaks shutdown process. It was a bugfix by Arthur to a
bad line which was testing for an impossible state - but afaics we do
actually want to flush in those states. It is possible I am wrong on
that though - if there are any shutdown issues introduced aroudn this
commit I would suggest further investigation around this flushing
behavior.
Use full endpoint string in monitor response

The endpoint was excluding the tcp://, causing tests to fail
Update ROUTER_BEHAVIOR documentation

Include a note about potential interactions with reactors, and update
reference to old FAIL_UNROUTABLE name.
Merge pull request #414 from ianbarber/master

Fix build breaking typos in monitor VA code
* oldrecover-src/amrecover.c: Solaris do not have sa_restorer.


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/trunk@4925 a8d146d6-cc15-0410-8900-af154a0219e0
* server-src/amstatus.pl (showtime): Use calandar days.


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/trunk@4937 a8d146d6-cc15-0410-8900-af154a0219e0
get trayer to work again
set terminal title and start X if not already running
workspace setup changes
deleted fvwm2 setup. xmonad rocks.
an rprofile, finally.
ignore some xmonad files
set vim as editor for mutt. everything else does not make sense.
updated ErrorException handling
Development snapshotr
Update checkbox submodule
Some improvements, getting started with client.
sync-all does git stash before pulling
twlist-winを使えるようにする
Updated to handle Filemaker field repetitions.
Adds some targets to discard to the global filter
added create_tasks and allocate_tasks code
Merge branch 'master-backup'
misc bug fixes
added hyperion patrol and nova alpha ships
fix bug in ip filter
* libc/stdio/puts.c (_puts_r): Fix typo in previous patch.  Add local
	variable fp for better readability.
* select.cc (select_stuff::test_and_set): Work around problem of new() not
returning zeroed memory.
* select.cc (select_stuff::test_and_set): Remove workaround and use proper
constructor.
merge from gcc

2012-12-18  Craig Howland  <howland@LGSInnovations.com>

        * libc/include/math.h: Add recognition of values 1 and 2 for
        FLT_EVAL_METHOD.

2012-12-18  Jeff Johnston  <jjohnstn@redhat.com>

        * libc/include/math.h: Remove the log2f macro.
	* libc/stdlib/strtod.c (_strtod_r): Revert change from 2011-05-16.
[Add] Created manage feedbacks dialog.
Clean up some unused files.
Ignore more stuff.
osd: peering: move to Incomplete when.. incomplete

PG::choose_acting() may return false and *not* request an acting set change
if it can't find any suitable peers with enough info to recover.  In that
case, we should move to Incomplete, not WaitActingChange, just like we do
a bit lower in GetLog() if we have non-contiguous logs.  The state name is
more accurate, and this is also needed to fix bug #2860.

Signed-off-by: Sage Weil <sage@inktank.com>
osd: peering: make Incomplete a Peering substate

This allows us to still catch changes in the prior set that would affect
our conclusions (that we are incomplete) and, when they happen, restart
peering.

Consider:
 - calc prior set, osd A is down
 - query everyone else, no good info
 - set down, go to Incomplete (previously WaitActingChange) state.
 - osd A comes back up (we do nothing)
 - osd A sends notify message with good info (we ignore)

By making this a Peering substate, we catch the Peering AdvMap reaction,
which will notice a prior set down osd is now up and move to Reset.

Fixes: #2860
Signed-off-by: Sage Weil <sage@inktank.com>
osd: replace STRAY bit with bool

We were setting a bit in pg->state that is private to the non-primary
PG.  The other bits get shared with the mon etc, but this one didn't.

Replace it with a simple bool.

Signed-off-by: Sage Weil <sage@inktank.com>
osd: initialize send_notify on pg load

When the PG is loaded, we need to set send_notify if we are not the
primary.  Otherwise, if the PG does not go through
start_peering_interval() or experience a role change, we will not set
the flag and tell the primary that we exist.  This can cause problems
for example if we have unfound objects that the primary needs, although
I'm sure there are other bad implications as well.

Fixes: #2866
Signed-off-by: Sage Weil <sage@inktank.com>
Merge branch 'wip-osd'

Reviewed-by: Samuel Just <sam.just@inktank.com>
mds: document EXCL -> (MIX or SYNC) transition decision

Previously (in w26f6a8e48ae575f17c850e28e969d55bceefbc0f), for reasons that
are somewhat obscured by passage of time, we did

+      if ((other_wanted & (CEPH_CAP_GRD|CEPH_CAP_GWR)) ||

But then we noticed that the loner may want to RD/WR and we are losing the
loner status for some other reason.  So just recently in
b48dfeba3f99451815a5e2a538bea15cd87220d2 we changed it to

+      if (((other_wanted|loner_wanted) & (CEPH_CAP_GRD|CEPH_CAP_GWR)) ||

Then we noticed that a non-loner wanting to read and a loner wanting to
read (i.e., no writers!) would lead to MIX, even when we want SYNC.
So in 07b36992da35e8b54acf76af6c893a0d86f048fb we changed to

+      if (((other_wanted|loner_wanted) & CEPH_CAP_GWR) ||

This appears to be correct.  The possible choices (wrt caps wanted):

loner  other   want
R      R       SYNC
R      R|W     MIX
R      W       MIX
R|W    R       MIX
R|W    R|W     MIX
R|W    W       MIX
W      R       MIX
W      R|W     MIX
W      W       MIX

Which means any writer -> we want MIX.  We only want SYNC when there is
nobody who wants to write.  Because you can't write in SYNC.  Which in
retrospect seems obvious.

Signed-off-by: Sage Weil <sage@inktank.com>
Merge git://github.com/ceph/ceph
Link linker (temporary)
Correct Content-MD5 header for Submit Feed.
Update plugin.yml
update plugin.yml
Added method and tests for new isLowerCase() and isUpperCase() methods. (MINOR)
.gitignore is no longer needed due to global gitignore from the git/ directory.
Unify gpusd/dash CMakeLists
Make it possible to change post status from archive to failed
[maven-release-plugin] prepare release snow-1.9.9
petite erreur de majuscule^^
PHPDoc.
Added ability to order by raw clause. This allowed for a MySQL's ORDER BY RAND().
Merge remote-tracking branch 'order_by_raw/master'; commit '7ee16f4665e8b35f13a117c34302666678447bfd'
+percent (bug fixed)
Fixed search area anchors
Fixed unmerged conflict
Merge pull request #117 from CS340Group/murphy

Fixed add undo
bugs fixed for removing items
Removed public/index.html.erb
Updated installers to reflect latest script changes.
Minor code restructuring and variable name reformatting
add jpg and png support to designer.

Codegen also fixed.
Remove period from end of intro message
Collision Bug Fix

Fixed Left and Right collision Bug
Mouse Support

Added basic Mouse support to move the dummy paddle.  Need to add
collision and fix a few bugs with mouse control
replace \n with space in text TV 
missing ejb ref in web.xml for messageService
add build in gitignore
remove new line in ttv ...
delete build
change time for broadcast mail
ttv remove lineshift, double space
transmitter station bug fix
new obstructions types underwater and hydrographic
endless loop bug fix in text tv
new email
date on nicewarningpage
vagts@dma.dk
Added norweigian test user (changes.sql)
bug fixes
Added working pointer arithmetic for STORE_STRING pointers, including __string+integer.
Added __stringarray and __far storage-classes. Also added a __strptr type.
Changed compile-time layout of string and long pointers. Run-time layout remains the same.
Pushing pointer literals now accounts for the storage of the pointed-to type.
MT_STRING access didn't evaluate the pointer.
Added extended %x printing to support all modifiers, the handler for which is in the newly stubbed stdio module.
clean code and move config to $.Valider
Indentation fix for Index page
Spinal cord of Featured Posts
Incoming posts, run for cover
MOAR links in portal
Setup scheme mode
GRAPHICS: Add initial stubs for animation and animnode classes
NWN: Create instances of Animation class during parsing
GRAPHICS: add high-level animation control loop
NWN: refactor animation management and populate default animations
GRAPHICS: have render loop calculate and pass elapsed time between frames to animations
GRAPHICS: Populate animation nodes
NWN: Load position and orientation keyframes when loading animation
NWN: Add a model cache to reduce memory overhead of supermodels
GRAPHICS: Basic animation logic now working
GRAPHICS: Inherit default animations from supermodels
FORMATTING: Run astyle to correct tab usage and bracket placement
GRAPHICS: Modify animation class to address issues from code review

- Make nodeList, nodeMap, rootNodes protected
- Move some code from .h to .cpp
COMMON: Fix formatting on a bracket
AURORA: Add function for hashing strings in HERF files

Thanks to DrMcCoy for figuring out the hash function.
Fixing stupid forgotten comma
modify cotime
Updated plugins to newer versions
fixed loader to not display when loading portfolio
forgot some backslashes
Misc debug changes and set up last deployment to hit a test destination server
Register defaults, but don't set them
Merge remote-tracking branch 'origin/master'
removed configuration of p2 version
单位系列修改
Signed-off-by: Endis <369029432@qq.com>
* Added CLogger class for loggin info to console or file
* Added CSoundInterface
* Added basic plugin interface
s/Configuration/Config in DI ServiceManager stuff
Trying to fix InstallSymlink.cmake on Windows
minor fix in cpac pipeline
Nearly there for the all documents rewrite. Having trouble figuring out how layouts should now work.

The problem is that we need to make the decision of whether or not to
parse special directories /^_/.test(dirName). Parsing would allow us to
watch those files, however can complicate the workflow as they all get
added to @database. Whereas if we don't parse them, then they are
entirely handled by plugins - which is probably desirable… It is a
tough call, and not sure how to proceed.
Cleaned it up a bit. Pretty big picture right now. Will have to break it down into smaller parts I feel.
added bevry to travis ci irc notifications
Lots of progress. Not detecting all layouts though, will need to debug further. Requires balUtil 1.6.x
All tests are now passing. DocPad now pre-compiles its coffeescript.
Now working with the balupton.docpad skeleton. Looks like the cachr plugin is firing multiple times, need to investigate.
Attempt at fixing travis ci tests. Inside the test suite we now run the install action.
Minor. Install errors are now forwarded to the callback
Working fine now with the balupton.docpad website. Need to do some more thorough testing.
Scripts, Styles and Meta blocks are now going. Watching is fixed. Watching is added for configPath. Added configurable collections. Added include to templateData.
Some bugfixes, all working great now on the website.docpad skeleton.
Fixed an error if docpad.cson is not present. Added a basic changelog.
Added version number to install instructions.
Merge branch 'somedocs' into 5.x
v5.2.1. Important bug fixes. Some improvements.

- v5.2.1 May 8, 2012
	- Fixed a complication that prevents `src/public` from being written
to `out`
		- Added automated regression tests to ensure this will never happen
again
	- Added `documentsPaths`, `filesPaths`, and `layoutsPaths`
configuration variables
	- Simplified model code
	- Cleaned up some async code
Merge remote-tracking branch 'upstream/master'
camera & rotations tested and working
Cf doc
Small cleanups and renamings in network.py
overview matrix changed
More help browser changes
ignore generated xmonad files
moved xmonad.hs to dist-specific filenames
fixed xmproc error in arch xmonad.hs
increased font size on xmobar
larger fontsize in Xdefaults
fix {vim,zsh}rc links
do not htmlEncode language names in language dropdown
+ autres
Update src/developpement-middleware/frameworks-et-bibliotheques-pour-le-developpement-web.rst
created general project structure and updated ignore file
Added my own implementation of the standard factory methods as outlined in Chapter 5 of the book
Updated ignore file to properly handle the nuget packages directories
new branch
updated
Merge branch 'maxbauer' of https://github.com/Geruhn/sysProg into maxbauer
besser
besser
noch darüber einigen über zukünftige vorgehensweise beim automaten
nur für dich andy ;)
Merge branch 'master' of https://github.com/Geruhn/sysProg
nur für dich andy ;)
Final fix at merge conflicts
Hashtabelle eingefügt, muss aber noch angepasst werden
Der Plan ist, dass alle Zustände alle anderen kennen, nach dem alle Zustände erstellt wurden, wird die Funktion startState() aufgerufen und das Array mit allen Zuständen übergeben. Dann wird bei setState(), immer der Pointer aus dem Array an den Automaten übergeben und alle sind glücklich.
Liste in Liste implementieren, sodass doppelter Eintrag nicht überschrieben wird
Liste in Liste implementieren, sodass doppelter Eintrag nicht überschrieben wird. neu und sehr schön frmatiert
hashtable eingefügt, muss noch angepasst werden
Kleine Änderungen, bereit zum Mastermerge
merge maxbauer->master, fixed conflicts
Neuen Kommentar hinzugefügt(Test Commit)
Punched the clock, added some comments
Müssen nurnoch übergänge zwischen den Zuständen gemacht werden und das bei Zeilenumbruch oder Leerzeichen der Buffer einmal ungetChar macht
Added test for :0<...> (invalid code)
Merge pull request #15 from GlitchMr/base-0-is-invalid

Add tests for :0<...> (invalid code)
Modify tests for Set.Str and KeySet.Str to conform to TimToady's suggestions:
http://irclog.perlgeek.de/perl6/2012-03-27#i_5358044
Change Bag.Str and KeyBag.Str to conform to TimToady's suggestions:
http://irclog.perlgeek.de/perl6/2012-03-27#i_5358059
Unfudge radix tests niecza now passes.
Unfudge niecza todos that now work. (I think because of changes in the tests rather than changes in niecza!)
test for X::Does::TypeObject raising for 'does' operator.
tests for X::Bind::ZenSlice.
add tests for X::Role::Initialization.
Merge pull request #16 from timo/master

tests for X::Does::TypeObject, X::Bind::ZenSlice and X::Role::Initialization
remove test for deprecated %C sprintf format
First bits of a plugin-based "humidity" system.

--HG--
rename : Makefile => Makefile.humidity
rename : mousebow.c => humidity.c
The simplest conceivable plugin.
Turned mousebow into a humidity plugin.
Fixes to mousebow's SDL dependency.

--HG--
rename : mousebow.c => mousebow-sdl.c
Simplify the humidity makefile.
Updating README for humidity.
browse for directory when adding torrent
fixes for path containing escaped characters
added: selection and start torrents
[0.162]mgButtonModで画像アイコンを使用できるように 他
●mgButtonMod を v3 にアップデート
	○ボタンに画像アイコンを設定できるように

●設置アイテム(壁/職業)選択ボタンを仮設置(一時的な処置)

●上層チップにも黒い縁取りを追加
	○これに伴いceldiv時の分割サイズを微調整(init.hsp)
Добавил вывод похожих видео по запросу.
If an edge already exists, don't run through the commit graph again.  This should speed up the loading of the graph.
Modified the if statement to have the true condition first.
Merge pull request #28 from nufyoot/master

Performance Improvement
Word Scramble - Added Checkmarks
Setando imagem dentro do ApreSwing ok!!!!!!!!!
Iniciado as deficições dos metodos ApresPlayer!!!!
Implemented basic radio.

Initially it uses a stream from http://www.scoutingradio.com/
for testing.
I have also left in the jPlayer inspector while
testing continues for other devices.
Generated minified versions of updated files.

(Replaced true/false with !0/!1)
Removed supurfluous stop button and jPlayer Inspector
Merge pull request #8 from IJMacD/Radio

Radio is stable enough to merge and move on
Merge branch 'master' into Barcode

Conflicts:
	css/style.css
	css/style.min.css
	index.html
	js/kij2013.js
	js/kij2013.min.js
Added list view and another test item.
Merge branch 'Barcode' into Learn

Conflicts:
	css/style.css
	js/kij2013.js
Trying to add mixins.less again.
Various small changes to reduce the startup time.
declared insere function
added test mode support, updated url locations
test directory

+this directory contains the test documents and methods which will
guarantee the performance of
+Cancer OS.
slightly updated XCode config
Added 2D Dock & Autohide & fix'd type
Add minetest.get_modnames() to Lua API
Add "/mods" command to list mods to client
Update Lua API documentation to include minetest.get_modnames()
Implement formspec
minetest.register_on_player_receive_fields()
Add /test1 command to minimal for testing a more complicated player inventory form
Doc updates for formspec
Formspec button_exit[] and image_button_exit[]
Merge branch 'master' of https://github.com/celeron55/minetest
Restructured some files/folders. Slight progress on login system.
Added a /raw feature to display the raw markdown syntax
Fixed ACTION format
adding environment with PS1
Git status alias (gs)
removed std string uuid from kristallimessages. Using knet source identification instead to recognize valid message.
windows needs to build debug and release as well
fixed few bugs
its work
UI funtimes
prsM
add some statistics and pickup tilehex
be compatible with recent gnome-shell

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
merge and remove tests/res
Merge branch 'master' of https://GlieseRay@github.com/Kotaimen/mason.git

Conflicts:
	tests/run_tests.py
Update the documentation about raster images
Ajout de exo2
Leanny
Add modules: Lesh, Pagination, ProfilerToolBar, Email
Del modules: Codebench, Userguide

Signed-off-by: Lesh™ <leshtm@ya.ru>
Upload CE Compatct to local install