labofsahil/github-event-dataset-2012 huggingface dataset:
Factor out Strategizer::update() into 4 sub-procedures

Strategizer:  Divided the update() method into four main tasks:
  1.]  Finding new Units, mapping them to Agents, and removing
       inactive Agents
  2.]  Remapping Agents to Managers (i.e. bidding (or the current
       hodge-podge of if-elses))
  3.]  Redistributing Agents to Managers (i.e. actually transferring
       ownership)
  4.]  Calling update on each Manager

Hopefully this will lighten merge-conflict stress and separate out
logically related tasks.
MERGE - after declaring my last commit would reduce conflicts...
Change Agent debug info to sit on one line
Trying out new cotton.js script. Removed old migration code (it's just couple select boxes), and wrapped functions to a class.
only balck side has JINSHOU

white side don't has JINSHOU limitation.
Added common Files
corp domain variable.

Signed-off-by: Yesudeep Mangalapilly <yesudeep@google.com>
Disable mouse integration in vim. It just interferes too much.
updated readme
basic mechanism for configuration, with sample config file. show login message to user
cleanup previous patch
small fix to adjust_shape
Use raw bootstrap resources instead of plugin
Cleanup
Added variables.less
Added variables.less
Renamed project
Updated Readme
Finished the ARMv4T instruction mapping for 32-bit mode.
Starting THUMB mapping.
Currency delete cmd.
add mail notification - tests
change type of params
Initiation

-Set up readme
-Started with a couple classes
Removed silly parentheses from solution file name.
Update notes for submitted changes

* Setting the disable_terminate flag on blessed instances.
Added example benchmark.html
Merge branch 'develop' of github.com:grisu/grisu-benchmark into develop
Fix the use of MainPanel in the MainForm
Don't try to resolve inner classes that we know don't exist.
create the release builds.
all files added for first time
Cadastro de caronas com sucesso usando RPC.
adapter e easyacceptadapter ajeitados para nao apresentar
printStackTrace(), ajeitei os metodos em que isso ocorria. Erro meu.
inicio de trabalho em StateSolicitacoes, GWTSolicitacao, alteracoes no
service...
adding my scripts
Merge branch 'master' of https://github.com/gwenshap/SQLDeveloper
Changed to displaying song title instead of stream name
Bug fix: showing the candidates
Changed the color
No title window
Change all cover source to network source
i
ijj
i
h
a better look
[html] removing cancel button from download
improve resource managements (part 2).
full window height stack
imagination functionality
merge done
dsssadf
Merge branch 'master' of https://github.com/hborisov1/git-testing.git
a sa da vidime
delete html teg in css js
gmail autentifikacija
Events can now be created or updated via JSON, bookings can be created
Option setting mechanism mounting.
Command history > Undo 명령(및 Object) 제거 처리 중
Improved makefile to produce tar.gz for distribution.
New matlab code from Pablo Ristori.
add notification for going into screensaver
minor refactors
Wave component created
waves manager created
Cleanup, pythonic code

Strip trailing space on line ends, pep8 cleanup

Improve bubblesort
- Inline swap
- hoist constant out of loop
- avoid unused variable 'x'
update log 11/16 by eric
minor changes to Instagram
Removed external references to make the project self contained.
Improved shutdown() to avoid segfaults
Cascade remove
When removing a project, delete all folders and docs in it. When deleting a folder, delete all folders and documents in it.
fixed couple 'not-enough-slides' bugs
alphabet now fully on correct arms
integer range map
And more  playing with rakefile
Nouvelle classe: POINT3D_RIO.java :Reusable (optimisation)
datawarehousing group by
icons in export menu, show export menu on toolbar button click
choose folder dialog on export
choose folder dialog on export
fix jar resource export issue
ignores
small cleanup, update coffee-script to 1.3.1
Abstract structure changed a bit. Basic implementation added.
Merge branch 'Unstable' into Solver
Removed -Gz compile switch when using MSVC. Using WSAStringToAddressW when compiling for Windows.
Correct minor mistakes in syntax. Prevent a leak in http_loop.
Fixes up to 12-11-2012 after workday
css fixes, cm module work, dropdown links add by cat. contype
add development tools
pin dev tools
add test and test coverage
add omelette
add --matrixonly option
ISPN-1960: Fix release script
Fix #93: Updated to compile with Java7.
Merge pull request #94 from dharkness/java7

Fix #93: Updated to compile with Java7.
Add recursive mergesort
Updated paster template with new index
Merge branch 'develop' of github.com:ingenuitas/SimpleSeer into develop
handle mongoengine futzing
fixed type in require
firmware: add return of current ADC sample on data endpoint, every 4ms or so

firmware: implement start/stop sampling commands
software: add repeated read of data endpoint
software: add start/stop sampling commands
Removed bookamarkable url for now
Reworked autocalibration.
Added tests for different accuracy settings.
scheduler refactored
Corrected misstype
add command-t and update README
fix event log query
Fixed migration name error
Explanatory notes
Change tmux colors
Change install procedure
Bump to 17214
fix last errors
added "average improvement of fval" convergence test for firstorder minimization techniques.
Merge pull request #4 from jasonbaldridge/master

liblinear wrapper
Merge branch 'master' of github.com:dlwh/breeze
Merge pull request #5 from jasonbaldridge/master

sbt 0.12.0
deployed our own jblas to maven central.
test for sad, and use NativeBlas for linear algebra operations in general
using nativeblas in more places.
getting rid of examples for now
create zeros for LFMatrix
major fix to LBFGS, pretty embarassing
stupid bug in matrix inverse from adding native libraries
builder for SparseVectors, useful for… building them
small change to Observation
test for issue #11
let's stabilize the neural networks test...
trigamma function, from Apache commons math
improved mle for Gamma, closes #11.

Thanks!
let's include the wolfe conditions in LBFGS now.
stabilizing a few randomized tests some more
basic visualization capacities.
Fixed pom.xml for maven 3. Fixed link in index.html
feed rss and xml both
Cleaning.
Modify wording when running scripts (see #9566)

This is only displayed when the objects are not in the same group.
Review the exit sequence when server is down. (see #8264).
added header to sample letter to allow validation
Fixing bug when invalidating more than 2 nested directories recursively.
changed route and added marriage.zip
Fixed spelling on a word and bolded text
Merge pull request #3 from UvaK/master

Fixes for project links.
Avoid error when a localization string for default language is missing
changed non-existing chemical shifts to 'N/A' instead of 0. to prevent a rounding issue
Made proofreading corrections.
Alert docs
Disables fasd plugin
update 01-08-12
Include some helpers to get/set time based on milliseconds.
Fin de la partie abstraction d'attaque
Another small view tweaks
Renamed project from Telling to Tellin
Added models and views

In preparation of Model view construction.
Added examples and new directory structure
KCButton支持非嵌入
stats alerting
test
init test
Added splot, manual seems complete now
Re-added page title to search after accidentally deleting it.
javascript call fix and typo
Update socket.c

I had to make some adjustments to this, sry if I am overstepping
should be writing images, however hurricane Sandy or superstorm Sandy or whatever she is now is going full blast outside so I'm not going to go outside to try and trip the camera to verify. Yes, front end is pretty ugly right now, next step is going to be to work on that.
added WeatherAndCalService stub
added ksoap2 jar and wsdl2ksoap library. hopefully will be able to use
these to get weather data
Merging RAXAJSS-111 with raxacore x3
some changes from a different person
finished feature B
html: added inline option to include css in emails
depage-forms: updated styles
depage-jquery-plugins: added some todos
moved oh-my-zsh to its own .zsh
Ta da now we have a passing test which shows obviously that on new product addition the observers are notified
ENH: cov_hac_panel change correction option, add weights_uniform as flattop kernel
Ajustando links que não estavam funcionando corretamente.
lots of helpers, auto_html, etc
require Ant version 1.8.0 so that skipexisting works for downloading Ivy
new troubleshooting guide for developers
Merge pull request #72 from lukeorland/ant-minimum-version-requirement

Ant minimum version requirement
Change subscription / listener system to use Subscription objects, instead of unregister methods

Previously, one would write something like this:
Listener l = new Listener() {...};
server.registerListener(l);
// ... some time later
server.unregisterListener(l);

Now, it's a little cleaner:
Subscription s = server.registerListener(new Listener() {...});
// ... some time later
s.cancel();

This pattern is used all over in other frameworks - notably, Reactive Extensions (.Net) and NIO (Java)
Switch to systemd user sessions

Instead of sourcing ~/.xinitrc, we now start a systemd user session.
Also, the X server is now terminated when the user session ends.
OS-1048 zfs list/get -c to return only cached properties
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
OS-1050 boot_time kstat for zones should be epoch timestamp of zone boot, not 'random' number
OS-1056 ip_dce_reclaim_stack() cannot be made perfectly safe
Reviewed by: Robert Mustacchi <robert.mustacchi@joyent.com>
OS-1059 new IP symbols need to be listed in symbol file
OS-1051 process starvation in FSS
OS-1058 libzfs_set_cachedprops() needs function header in libzfs.h
fix git-pbchk.py merge
OS-1064 rcapstat should direct you to zonememstat
OS-1063 Add a 'big theory' comment to FSS
OS-1077 Update timezone info db to 2012c
OS-1028 page-level corruption induces kernel panic
Merge git.joyent.com:illumos-joyent
Fixed javascript exception
novo status cancelada
fill db fixed
use '<?php' not '</'!!!!!!!!
Merge branch 'master' of github.com:jpope19/GatorAirlines
merged
Huge documentation clean-up, and updated puthesis to more closely match upstream

* Moved all of the file header-type comments to the CONTRIBUTORS file
* Removed all of the file header-type comments (e.g. the huge lines of "=")
* Converted README to use GitHub markdown
* Added usage instructions and contact info to the README
* Added the changes made upstream in later versions of puthesis.cls and front.tex
* Rewrite comments so they better fit in with the upstream 'puthesis' style
* Added TODOs were necessary
* Added more complete documentation to thesis.tex

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
There shall only be one style attribute
added on ready on robot utils.
Restructured gem files and folders
Correct some paths
Switching to UTC time for the main timezone
fix in geometric matrix transformation
Enh: improved the check whether or not CUBRID PHP and PDO driver are installed and enabled.
v1.3.0: added support for CUBRID 8.4.3 and 8.4.1 as well as corresponding PDO and PHP drivers.
Use mysql2 gem instead of mysql, and remove sqlite.
SpreeWarehouse
def: 6092
Screencast improvements

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/tags/gemini_2012_10_22@92245 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
fwr: return true in events consumers

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/tags/gemini_2012_10_22@91622 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
More pong feelings
Could not manage to add a texture
Patching is no longer necessary.
moved markdown template to a url (pulled in via directive)
completed showdown/markdown and prettify demos
added bootstrap test page
Changed to SocketRocket Instead of cocoa-websocket
Added support for SSL
Merge branch 'release/0.2.7' into develop
bad call
bump da version
Merge branch 'release/0.2.8'
emoved odd files:
add crappy common views locals
skinning login + header change
adding GetInstance<T>(string name) for FubuFastPack
updating buildsupport
adding a ValueAs(Type t, string name)
Refactor InputParser for long and short flag aliases

- Made constants private
- Added helper methods IsFlag and IsFlagFor to internalize the logic about long and short flag aliases
- Renamed ToFlagName to ToFlagAlises to expose the long and short aliases for a flag
Add FlagAliases class to represent the multiple aliases for a flag
Update FlagAliasAttribute to take long and short forms

Obsolete the single-arg c'tor to force people to provide both forms
Add convenience extension methods for flag aliases
Remove flag alias parsing logic from token handlers
Update and add new tests
Fix the usage display for Enumerable arguments
Add better error reporting for Flag (missing value, bad enum, etc)
Further tweaking usage message for enumerable args
Add tests for flag validation
Add ArgPreprocessor to sort out multi-args
Add better detection of short and long flags
Add ArgPreprocessor tester to csproj
CommandFactory calls ArgPreprocessor
Just remove old FlagAliasAttribute ctor, since it's pre-1.0
Reverting the enum checking as this breaks ObjectConverter's more flexible Enum parsing
Bumping version to 0.9.9
Validate sets.
Add README with the contents of Amir's BlogPost
Last commit before using Fawcett's parser & tokenizer

Well, use Prof. Fawcett's parser, in case of running out of time before
project due..
-Wired RavenDB
-Can show all books
-Can drill into a book details
Rename header as head
  scope all views in Bizzy object
  spec Bizzy.Row instantiation
added Jackson's documentation of the gameboy decision matrix
Added Requirements documentation, and information about lack of weighting.
Merge branch 'master' of github.com:killerfriend/womprats
'with' statement for python 2.5
Adding a standalone adapter
Removing recursive directory search, not very stable right now
Fixing wc -l implementation on getTotalCommits
Fixes OpenLayers.Style.addPropertyStyles to use OpenLayers.String.tokenRegEx instead of hardcoded regexp.
remove the row
Close some TODOs.
Extended the installation description

Now explaining how to move away the existing files and instead
using symlinks to the checked out clone of the theme.
Merge pull request #11 from mrimann/installation

Extended the installation description
fix wayland cpu meter display
tag vorbis encoder proper
testing
Merge pull request #2 from cvanhoey/master

This is a test for class
Merge remote-tracking branch 'remotes/krhodes/master'
lots of deleted images
update depending library to new version: scalatra 2.1.1, typesafe-config 1.0.0, amqp-client 2.8.7, and some other
Changing README.md description.

Adding some installation tips and useful links.
updated docs

Signed-off-by: Sam Ashley <sam@kwaledesign.com>
Added ad block to the right
to fix group bug
Fixed #763: on_delete handling. Thanks to George Lund
Fix timezone-awareness of test suite
Release version+docs bump
Added tag 0.7.4 for changeset 738417d7a8ab
move the fonts to the build directory during build
redirects if no genre, music, etc.
Always use OpenSSL::Digest
Should decode the DigestValue instead of comparing with the encoded hash.
Added tests for SHA384 and SHA512 algorithms.
Merge pull request #34 from lawrencepit/sha

Should decode the DigestValue instead of comparing with the encoded hash.
These are functionally equivalent

<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
More NS resolution
Merge pull request #35 from onelogin/morten/ns_resolution

These are functionally equivalent
Resolve names on Windows
Added libkmsagent library and pkcs11_kms
Added libkmsagent library and pkcs11_kms
Arreglado, Campo direccion obligatorio en creacion de cliente
Arreglado, control del ultimo cobrador antes de eliminar
Arreglado control de ultimo cobrador, al eliminar cobrador, Arreglado tambien control de existencia de cobradores antes de crear cliente.
Calculo del saldo atrasado arreglado
fix lastruncheck to be compatible for 2.6.7
find not search
no need to log to the console as we don't use puppets logging feature
Merge commit '05a9d526ab7a23dea30058dbb3ac21a9bb521dab'
Fix lastruncheck.

Patch by pietro.
Revert "the debian-specific case doesn't work for squeeze, so re-factor the way it is"

This reverts commit d38e7cf64902ff55138e5f85cc7c3b880ea5fb74.

Current puppet package in Squeeze does not start by default => no need to
special case it.
stash selection state
added &block as argument for `SystemCommand.new`
reup wishlist layout
Structuing input values so they can carry raw and converted input values around.
Dene's spelling/grammar/wording comments.
Merged wording changes by Dene.

The meaning of all Regulations should be unaffected.
Updated readme with Bootstrap
Reset back after we're done testing. Use soft as hard is broken at the moment.
FACES-1358
Develop JSF1 <-> JSF2 compatibility layer
(Refactored using Wrapper interface since JSF 1.2 ApplicationFactory does not support the decorator pattern)
Added a new activity and fragment for reading a single story
Readjusted the style naming conventions (this area will recieve more
attention in the near future)
Updated stories list to properly launch the story reading activity
Added missing licensing text to head of files
Reoriented list fragments so that their parent activities pass in intent
values instead of parsing the intent in both the fragment and activity
Switched the preference cookie store to use Base64.encode() and
Base64.decode() calls for actual base-64 encoding/decoding rather than
doing it manually
Added support for feed favicons
Added support for folder icons for folder entries on the feeds list
Updated all styles and removed extraneous styles that did nothing
Created views for use in the feed and story lists instead of using the
ViewHolder pattern
Removed drawable-ldpi folder, this bucket will be auto scaled from
existing assets
Added margin for story list item view
Added support for sorting feeds and folders
Created a default list selector for lists and fixed styling issues that
made the ActionBar colors odd
Updated feeds list to display unread counts (stories still do not
support read/not read state)
Updated stories list so show different styles for read and unread
stories (marking stories as read is not yet supported)
Fixed a bug where feeds without a favicon caused a serialization error
in the Favicon class (this was fixed by forcing Feeds to have a favicon
by default)
spacing issue
Added skeleton classes for mark as read requests and queueing system
Fixed a bug where the StartupActivity manifest entry had a label
attribute
Added basic parsing support for the Story class
Created methods for showing loading and showing errors in order to
reduce duplicate code when using this view
Updated comments, error messages, and LabeledProgressBar usage
Added new styles and messages for the stories list
Updated stories list fragment to correctly display parsed story
headlines (viewing a story is still under dev)
bug fixes on const vec evaluator
main: cleanup (minor).
Remove Comments from Pasty. We have a spearate Database model for that now.
Cleaned up some Android.mk files.

Removed WinAmp files from the GSF plugin dir.
Removed Linux and XMMS related files from the SexyPSFPlugin directory (they are not needed).

Updated Libzip to revision 1141
Optimize method invocation to exclude func_get_args() and array_shift() on each method call
last set of changes
Очистка полей фильтра в личных сообщениях
Add basic NATT LCAF decoding
Ìácomplate auto search
complate auto search
filter bar CSS done
Fixed some of the formatting and changed the pivot point from 'nuget' to 'feed'
modify Cell.merge to have no side effects

it just returns the value of a merge between old content and new
content, or raises a ContradictionError.

this value is then used by Cell.add_content to update the Cell's content
if it is different from the content that the Cell holds.

create ContradictionError exception
modify IntervalCell.merge to override new Cell.merge
fix bug: wrong logger name
add generic_operator module.

this module contains functions to make generic operators and assign a
certain function to be called if the operator' arguments match a list of
tests.

this module will be used to merge cell's contents with increments based
on content's and increment's types.
replace old style merging with new style

old style used classes inheriting Cell to extend its merging behavior;

new style adds different functions to generic operator 'merge' according
to arguments' types.
some tests for generic_operator module
modify examples to new API
use new contradiction API on test
generic_operator module-level docstring
change class name to be private in module
refactor

change Interval.__eq__ to have same effect with less code

put private functions of propagator.interval before API functions

changed the `tests` argument for `assign_operation` throughout
propagator.interval and propagator.network, to be more readable and
avoid problems regarding 1-tuples without trailing comma, on operators
of arity 1.
assign 'sqrt' operator for intervals
make lift_to_cell_contents a private function
make primitives of generic operators\n\ninstead of making them directly from the python functions
remove imports of obsolete interval.primitives
add a `name` attribute to `_GenericOperator`
remove search logic from _GenericOperator.__call__

create method _GenericOperator.operator_for to search for a operation
whose tests match the method's arguments, which is used inside __call__.

this change was made for debugging purposes.
str, unicode and repl representations for _GenericOperator
let assign_operation take multiple lists of tests

when this happens, assign_operation assigns `function` to the operator
with name `name` using each list of tests.
remove old return exp from operator_for
bug fix
refinements
Travis: Install additional nltk packages

Required for Gal's commits, as she uses POS tagging.  Also, reorganize
.travis.yml a bit.
moris code
Extended error handling when determine IP version
response mime not defaulted to octet-stream, removed \response->header()
ie fix i hope
ie fix i hope2
enabling crawling
ie fix 2
ie fix 3
ie fix 4
ie fix 5
typo (reverting removed spaces).
Added selinux policy
commented out debugging code for now
Refactored fasta id generation
Added a few helper tools for testing gff3-ffetch
base: handling of cmtpkgs from local-cfg
[s2501] Implement trash waves event for Nalorakk -Zul'Aman

Based on the work of Rowman

Signed-off-by: Xfurry <xfurry@scriptdev2.com>

(based on commit c72330b)
Creacion de documento pdf nuevo en cada impresion.
Corregido error en la impresion del reporte combinado.
update update_cron
modify fanpages.php
merge mannix code
Merge remote-tracking branch 'stephen/master'
d3 graph line axis fix.
admin side, badges , etc.
added define-local-member-name to use a protected like modifier
Site updated at 2012-12-19 02:07:10 UTC
more tests and bugfixes
Merge branch 'bootstrap' of github.com:marcoraddatz/candyCMS into bootstrap

Conflicts:
	app/controllers/Sitemaps.controller.php
Adding code to drive robot manually
Trying to get all the wheels to spin
Adding manual test
Custom header contextual help updates. Props TomAuger. see #20518

git-svn-id: http://core.svn.wordpress.org/trunk@20718 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Don't concatenate translated strings. see #20518

git-svn-id: http://core.svn.wordpress.org/trunk@20719 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Twenty Twelve: fix bypostauthor styling, probs obenland and SergeyBiryukov (also improves the RTL layout, see #21441).


git-svn-id: http://core.svn.wordpress.org/trunk@21483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
ImageOptim for uplaoder icons. see #22610

git-svn-id: http://core.svn.wordpress.org/trunk@22940 1a063a9b-81f0-0310-95a4-ce76da25c4cd
3.5-RC2.



git-svn-id: http://core.svn.wordpress.org/trunk@22926 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Fix the "Uploaded to this post" filter in the "Add to gallery" state. fixes #22723

Also, use "images" wording instead of generic "media items" when in a gallery (images-only) context. fixes #22722

Both are props koopersmith

git-svn-id: http://core.svn.wordpress.org/trunk@23068 1a063a9b-81f0-0310-95a4-ce76da25c4cd
finished reviewing the TS chapter
9P/RDMA: Forgot to fix an improper check before free...
(Note: free(NULL) works, do we need to check?)
fixed two typos (overlaysi and installationafter)
updated modules
added backbone
initial work towards backbone
dozer fixes
Hide Tk root window until later

On Windows, when using the tkagg backend with mpl 1.2.0rc2, before a figure window is displayed, a small, empty window is shown for a short amount of time.
Merge pull request #1285 from cgohlke/patch-12

Hide Tk root window until later
Make grid accept alpha rcParam

Default grid.alpha is 1.0
Update rc file to reflect grid alpha parameter
Merge pull request #1114 from dmcdougall/alpha

Make grid accept alpha rcParam
Added Functions:
	getQueryString
	setCookie
	getCookie
	isMobile
Minimal changes for Program sections.
Fix: polishing the merge with "simpler"
@relburrito pointed out this bug
Actually, serve static files in production, Heroku doesn't do it otherwise
Added convertor for old guide types!
Add get '/detailed_many'

model/neuron_loggedin.rb
- Modify self.read_log() to receive min_users from argument
  options and filter the log not to display those of which
  the number of the users is smaller than it.
neuron.rb
- Add get '/detailed_many'.
views/layout.haml
- Add link to '/detailed_many'.
Make sure that lists within results clear floats properly
Fix saving records to lists
Merge branch 'anythink-theme' of github.com:mdnoble73/VuFind-Plus into anythink-theme
Start process of splitting holds pages for mobile interface
Do not use hash map when updating alpha broswe to try to preserve memory
Fix processing of large result sets
Added a very simplistic urls.py
Added a file to make fixtures and the fixture so created
define socket path
Login functionality, why I can't delete line_item from cart??
some fix
Merge branch 'master' of github.com:mercadolibre/bigcache
fix ack error message
Enable comments in case bug later on
Solved a problem with submitting a movie.
added methods to determine if a SyncML transaction is one-way
removed extra spaces
updated one-way transactions to expect the server to not respond with an empty Sync
added method to extract pending changes
added test for client-refresh behavior
Fix preferred syntax and don't initialize on precompile.
jdk版本改为1.7
The same fix for data.json compatibility we had in clojurewerkz.support.json
1.3.4
Back to snap
Merge branch 'master', remote-tracking branch 'm/master'
finally up to date with tests
fixed set-bang form to define in nearest enclosing environment
working on do_cond_form
Merge branch 'master', remote-tracking branch 'ken/master'
Adding some new requirements for testing.
Removing non-mini bootstrap bits.
Cruftinator!
Updating bootstrap.
Goodbye extraneous logging.
Showing status as upper-case.
A large-scale bot overhaul and some testing infrastructure for it.
Adding silly logging.
Making the motown daemon respawn.
Pulling javascript assets from an SSL-enabled server to avoid security errors.
Test environment configuration.
Socket & UI following the bot revamp.
Oops. School-boy error.
Merge remote-tracking branch 'simonwex/master'

Conflicts:
	app/irc/bot.js
Now printing the date in verbose mode.
Verbose per-feed messages now go to STDERR while the fetch summary goes to STDOUT.

This allow cron jobs to split the summary from the verbose (debugging) logs.
Setting timeouts on the HTTP Requests so that fetches don't get stuck.
Slow feed messages now get printed to STDERR.
added flashsocket transport logic
Tweaked some parameters on proxy-nlp tests.
Renamed some links on the movie display page
chosen state highlighting working with ugly javascript
Makes credits table a little more viewer-friendly
adding more sysadmin productivity tools
Merge pull request #1 from miketheman/credits_table

Makes credits table a little more viewer-friendly
finished productivity tools outline
added security_101
added security_201, and lots of work in torubleshooting
added networking 101 and 201
Syllabus porting DONE.
added a "how to contribute" section, and added architecture 101, 201 and load balancing
Icebreaker commit: A simple typo fix
Merge pull request #2 from blueben/master

An icebreaker commit to test my commit workflow. The commit is a simple typo correction.
Updated contribution intro for feature branches for pull requests
Fix typo in Text Editing 101
Capitalize Vim per vim.org
Fix typo in Package Management 101
Filled in a couple items in File Systems

I ran across this repo from a tweet.  Was interested in helping out.
Picked a section, and attempted to add some value.  Giving this a
shot, hope it is useful.
Merge pull request #5 from retr0h/fhs

Filled in a couple items in File Systems
poor grammar on my part
Merge pull request #6 from retr0h/fhs

poor grammar on my part
Fix small typo
Added test cases for some of the packaged pbytes predicates.
learning progress report
First test with CherryPy

Testing the CherryPy framework and Moko Templates.
Added : 'web' directory for the server.
added m16 and m1911
add rest-client dependency, allow multi_json to exceed the 1.0 line, only requiring 1.x
customizable local directory with repository
Removed unused urllib dependency
fixed slideshow on homepage, added some foundation mobile styles
fixed the wrong composer type
adds docstrings
Merge branch 'master' of github.com:modilabs/load_shaping
Merge branch 'master' of github.com:modilabs/load_shaping
adds comments to code
gem file
Merge branch 'staging' of github.com:mohsinali/vq-intranet into cucumber_testing
Merge branch 'staging' of github.com:mohsinali/vq-intranet into cucumber_testing
First cucumber test passed.
cucumber
Cucumber tests passed
Cucumber testing merged in staging
Fixes to get project to build.  Namely adding nuget packages for tests
Updating references and changelog.
lots of work towards a tighter Multiverse integration
Add update about rspec
Uses modeline properly
Fix global leak
Merge pull request #134 from rkusa/master

Fix global leak in http-meta
Deepan, Sanjana, Ausi | #377 | Enhanced jmeter script to submit multiple forms from each thread
Merge branch 'master' of github.com:motech/GHANA-National
Balaji | adding an if check to avoid stacktrace in logs.
Aravind | #2082 | Logging doc id instead of subscription id.
Sneha, Ashish | #1771 | Ensuring that httpclient used for obd file requests is thread safe by passing threadsafe conn manager in constructor.
Hari/Aravind | #76 | Added timestamp check when processing location updates.
Make sure we return the proper global, which fixes our input use.
Remove extraneous debug statements.
Removes old frame management logic for test_load_marketplace
Merge pull request #51 from jds2501/load-marketplace-fix

Removes old frame management logic for test_load_marketplace
Added test_launch_app for moztrap-1333
Added test_launch_app for moztrap-1333
Merge branch 'moztrap-1333' of git://github.com/yurenju/gaia-ui-tests into moztrap-1333
Merge branch 'moztrap-1333'
fix bottom scrollbar, make layout more responsive
Генерация изображений из видео
Revert "Added @group finder to Topics#new"

This reverts commit 77c7d4c0c45fb6bce315fa75af7b22cae8822095.
* Transformed booleans to lowercase (See PSR-2 2.5)
* simplified parameter checks for method "_prepString"
* Reworked umlaut transliteration (calling str_replace only once. Performance reason)
spamassassin: add explicit default reject_type

consolidate the two data_post methods into one (more linear, simpler)
more informative log message
add new headers to top of headers (not bottom (consistent MTA behavior))
headers: plugin tests, deprecate check_basicheaders
bugfix on pubmed service; now should not give incomplete xml errors;
also exceptions are now thrown so that they are shown in the UI
using devDependencies instead of dependencies in pacakge.json. depenendencies are what is actually included in the build.
improved survey
Merge branch 'master' of github.com:mujtaba3B/survey_star
update copyright email
Try telling template::toolkit to chomp all the whitespace to solve this translation bug
choose better example places
do not send report sent confirmation emails for anonymous reports
stick subcategory details in $h if there is one
add in user details field to %h so we can put sensible user details in anonymous reports
email template for see something reports
Various style changes to make Bromley look a bit better.
Bit of group message code tidying.
Added the submodules
Added the submodules
Only move ball if left/right keys were pressed.
Moving labels work to a function.
Gerência de viagens
removed int based point, replaced with GLPoint
s/teamspeak/voice chat/
Add simple chat-like application.
Merge branch 'master' of github.com:nbeloglazov/snakejure
fixed up some blog views
Added manifest file for jQuery's plugin repository
added more testing with fixtures
Add extend scope to the compiled CLI option.
Release 1.1.1
Generate latest browser package
normal map setup
normal map fix + terrain normals fix
Update README.md

Emoji fitler ommits escaping, which can lead to very nasty bugs.
Merge pull request #5 from defrag/patch-1

Update README.md
Making messages more consistent.
Fixing typo and continuing with OO version
Cleanup rbenv usage around gem installation
Use explicit USER, LOGNAME, HOME variable for gem command
Fixing some defined types so you can install multiple rubies
Merge branch 'master' of git://github.com/newrelic/puppet-rbenv

Conflicts:
	manifests/compile.pp
	manifests/gem.pp
	manifests/user.pp
android differentiator
Integration of splash page.
updated RPI setup script
Update modified checkbox properly.
lazy relation uses proxable; transaction holds persistance information about whole object graph
a simple algorithm for detecting extract method
changed regex to be more specific, in order to allow for <%-- to be caught in xml.js (<% passes | <%-- fails)
remove .DS_Store and ignore them in the future
creating a project 2
Clean up.
Refactor init* functions into init_hardware; Remove unused vendor requests.
usb submodule updates for correctness (and speed)
Attempting another RVM-specific thing.
update string
Merge branch 'master' of github.com:norman0612/NSBL_gcDev
Bumping the deployment target to iOS 6
Added new tiles for the 8x8 tileset.
Added wondrous numbers.
#5845 putting issue codes in their rightful location
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
Added refresh of Senators and Committees.
Fixed notes for SHAPEFILE lookups so that GEO info is displayed.
Merge branch 'redistricting' of github.com:nysenate/Bluebird-CRM into redistricting
only run this path if we actually have graphs
remove debug
add some throttling to end-of-document scrolling, refs #55
Moved the components used by the end to end tests into the samples folder so can also be used to provide a quickstart
Renamed gav and packages from sam to bam, and simplified activity server to EPN bridge to use EPNManager ref, rather than JMS.
OrganizationResource move to portal project.
README - your own fields
[2269][plugin] clean up: remove unused code
[2269][templates] bug fix: add resources_json to dataset edit template
[2269][forms, templates] add translations for publisher selection drop-down
[2269][templates] temporary hack: add version of js_strings with change to youHaveUnsavedChanges so doesn't break on dataset edit page in languages that had an unescaped double quote
tranaparency
Multiple channel support

now I can farm multiple channels for answers
Adding phpunit xml configuration for excluding cake libs from coverage
Exposed terminate process in ContainerAgent messaging
renamed workflow objects and service
Fixed image paths/links, TOC, example formatting, in oop tutorial
Merge pull request #103 from davidglivar/master

Aesthetic/Functional changes to the OOP tutorial (tutorial content not altered)
Making events easier to test.

This should make it more straightforward to test the new event properties being sent with loadend on BBOX and Fixed strategies (see #624).
Doc fix for merge method.
Tests for response property on loadend event.

This confirms that the loadend event includes a response property when it results from a call to the strategy merge method (see #624).
Added sa-service deployment docs, tested on dotcloud.  And a stub UPGRADE.md.
Have the config information load from a flavor-config folder

- Create a flavors folder
- Copy the ATM demo configuration information into a flavor folder
- Move the flavor-specific assets into the flavor folder
- Move the flavor-specific translated strings into a translation template folder within the flavor config
- Update the Django views to load from the flavor config
Simplify the way that JSON is transferred from the config file to the template
Move translations strings from index and add-place from po file to config.yml
Added anonymous_name value to config.yml
- Add anonymous_name to place, support, and survey config
- Always set submitter_name in the client templates if blank
- Delete submitter-or-anonymous partial
Empty out the i18n po file
Update the Dotcloud postinstall to inject the flavor information into the settings file
Add comments to the postinstall
Add vanilla settings to the default_config flavor
Add geolocation to NoSur
Merge branch 'sa-web' of github.com:openplans/shareabouts into sa-web
Removendo o link para o Heroku do README
add updating user ability
add lunch script for Taipei
update server side readme
1er commit des sources
allow for using own smtp server. default to sendgrid. closes gh-193
Updated the README markdown to reflect correct policy, information, and licenses.
Fix: correct url of the overlay in sqlite
Merge branch 'develop'
index without js
First COMMIT to the repo
find_skills() rudimentäre funktion um skills zu filtern
Configure endian for Windows
Dutch languages translated in several modules
agrego lo nuevoo!!
Make default avatar thumbnail size 140px square
Remove user updates from members directory screen
Rework the Members screen styling so the photo/name/last active information appears vertically, rather than horizontally.

This will distinguish between the Groups and Members directories. I
believe most sites would want more information displayed per Group on
the Groups directory than the on Members directory.
Changed description
Added aliases to gitconfig
Testfile added
Merge branch 'feature' into develop
Updated PayPal Invoice SDK README
Move to nopaste.
Snippets i used in my kata while cheating
updated for volume 2
Add database_cleaner to truncate mysql db after every test
Order teams view by creation date
Signed-off-by: Paul Chasle <pchasle@gmail.com>
Merge branch 'master' of git@github.com:pchasle/reserve-caloa
add speaker: bobchao
removed collectd puppet service
updated chrome repo
Added stuff for Ruby Testing and BIND
Minor update of the menu setting
Added in user loading
activate timer only if TIMING_ENABLED flag is set
add timing to DedispersionPipeline
in progress: more efficient GPU resource allocation
Add Apache license
Merge branch 'master' of github.com:pepeyuilop/ecomponent
make a basic user model chapter 6
Fixed hiscore window not showing up after game finishes.
Switch to public open source docverter installation
Merge branch 'master' of github.com:peterkeen/bugsplat.rb
random commit
implemented new base exceptions, updated some validators and tests
Added
Deleted test file
Tweaking event sytem on dropdown
Add My-JSR168-Portlet and Jsr268EventPublisherPortlet
Corrected typo - French - sites vs sotes
3.4.10.2 release
Porting fix for bug #3578776 to QA_3_5
Merge branch 'QA_3_5'

Conflicts:
	js/tbl_select.js
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Fix mixed up expected/actual params
Add missing space
Define some required params
Pass correct parameters to tested functions
Gettext makes no sense here
Missing space inside html
Add missing space between attributes
Fix
Use RegExp based matchingi nstead of exact html
Move all setup to setup method
Improve speed, see the comment on
https://github.com/phpmyadmin/phpmyadmin/commit/04698355e48775da41ddef37b5323e36ad3f6be3
Merge branch 'QA_3_5'
PLFED-292: handle wst:Renewing gracefully
Merge pull request #29 from anilsaldhana/master

PLFED-292: handle wst:Renewing gracefully
Site checkin for project jarachis-time
PC try merge master
Fixed slingshot dependency
Added pantheon-notify
as found
ipvt6
nieuwe host: zimbra
extend the probability of the node precision to 5 digits in JSON return object
2e try out, after this I will name it specific
- updated to 3.3.12
- updated acfixes patch
- removed obsolete ac patch
id's should be without dots
added some plugins and stuff
Trying to make home page look decent.
Вывод информации по ордерам в операциях
add some more comment to parse.py
Updated prey-trigger python scripts for OSX and Linux.
Added .gitignore
Added generic mongo search method /find in the nest api.
Fixed content spill over footer div. Added Clear:both to #MainFooter.

Signed-off-by: Adaberemchi Aja-Onu <eieicyl@gmail.com>
Should handle empty dates
Bump version to rc7
Renamed hello_openg to opengl_hello_world
Updated comments in cmake
Saravanan rspec added
RSS Feeds für Personen.
punch-android-start-up APP
backcountry working
Initial commit of Magnesium code
Fix numpy problem in ubuntu
show+google
Update Gemfile to use ar-deprecated_finders
Fix gemspec homepage to point to rails repo [ci skip]
Remove activemodel from Gemfile
Fixing variable name.
Refactoring the interfaces for statistics collection and extraction.
Fixed header write button
don't use virtio if using qemu
Merge pull request #43 from rackerjoe/ubuntu-precise

don't use virtio if using qemu
Auto Updating swift submodule
Auto Updating swift submodule
Auto Updating glance submodule
Auto Updating glance submodule
adding an example.json environment
Auto Updating keystone submodule
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Auto Updating horizon submodule
Auto Updating nova submodule
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Merge pull request #150 from galstrom21/sprint

Adding an example environment (example.json)
split swauth from kong into kong-swauth recipe
Merge branch 'sprint' of git://github.com/rcbops/chef-cookbooks into sprint
Merge pull request #151 from rackerjoe/sprint

split kong recipe into swauth and keystone (still called default)
fix ip address
Merge pull request #152 from rackerjoe/sprint

update ip address default
Auto Updating glance submodule
Auto Updating glance submodule
Auto Updating horizon submodule
Auto Updating swift submodule
remove aggressive whitespace
Merge pull request #234 from rackerjoe/sprint

remove aggressive whitespace
Bumped maxVersion to 17.*
Adding a Python requirements file.

This lets us reproduce the build environment easily.
Add ignorance.
Changed most of the English output strings to formatted strings.
Dropped account/profile independent support.  Now account is a profile.
troca cargo
Automatic update [Tue Aug 14 18:13:00 CEST 2012].
Automatic update [Thu Apr 05 18:09:23 CEST 2012].
Dependencie auf wget eingebaut
api DB구축 및 API 뿌려주는 기능 추가
수정사항 수정

file 이름 변경

bookmark.js 에 추가한 내용을 scvnewsviewer.js로 옮김
test
bump Tk sha1
Bump HDF5
bump Winston sha
Bump DataFrames SHA1
Bump Options
Add Grid package
Bump Options for Harlan's commit
Bump DataFrames SHA1
Bump DataFrames SHA1
Bump DataFrames SHA1
Merge branch 'master' of https://github.com/rennis250/METADATA.jl
GRIM: Don't draw a shadow only if the actor and the shadow caster are on different sides of the shadow plane. Fixes #636
GRIM: Cleanup.
EMI: Use the correct up vector.
Merge pull request #651 from Akz-/shadowfix

GRIM: Shadow casting fix
modified "bytes added" to accept all users within timeframe if no user_handle arg is submitted
allowed arg user_handle to be unspecified in cases where all users in a timeframe are required

removed unused import statement
Script to generate daily average totals for editors
modified the default start date
FIX: only one pending job for a givemn url may be on the queue at any given time:

https://github.com/rfaulkner/E3_analysis/issues/22
MOD: emit error message when user tries to regenerate the same job
Changed windows product to use publicly available template(s)
Fix: quarantine failing build test causing release to be held up.
Made ctrl-click possible
problema com nerdtree
Instalando ack.vim
Removendo gundo
Added php syntax highlighting to readme
if value gets type coverted don't set original value before overwriting it
Better database structure:

- Snippet class doesn't inherit from Document any more,
- The Snippet class should be used only as a base class for implementing
  other snippets
- TextSnippet is good example how to implement own snippets.
Merge branch 'master' of https://github.com/rkintzi/KottiSnippets

Conflicts:
	README.md
save before attempting to reinstall foundation
working wiht foundation clearing
adding weddings page
added enquire button to weddings page
added corporate page
adding of clubs section to site
moved club views to partial, adding upcoming events
Improved the detection if the process has stopped. Top now runs contiously and thus should produce better CPU % results
YAFFS2: update to Jan7 mainline merge

commit 2823629
Merge: 6a1296f 66cf3cb
Author: Charles Manning <cdhmanning@gmail.com>
Date:   Fri Jan 7 14:19:08 2011 +1300

    Merge branch 'mainlining'
Regen Confs
Updated config settings
New Rake
Deleted README
Added directories
Updated Gems
Removed legacy stylesheets
Removed legacy stylesheets
Remomved public JS directory
Upgraded devise
Add devise back in
Updated oauth
Added twitter bootstrap
Moved to assets dir
Moved home page and app layout to TB
Refactored to use TB
Allow passwords to be reset
Refactor footer
Removed unneeded icons
Renamed to use builder rather than rxml
Fixed todos
Section 2 a)
Cleaning up to use url_for rather than generate it in model.
Adding log in / log out code.
fixed indents in sublime text
Correct reading of sparse data tags.
Raise NoSuchProperty correctly
Added an install generator.
Added an initializer for configuration.
Added project owners to main assembly source file
Drop some things that are irrelevant to an Ubuntu package.
Add support for keyword arguments to @memoize'd classes/functions.

Kinda. You still couldn't say Photograph(filename='/path/to/file'),
because it only looks at the first non-keyword argument for cache
lookups. But you can now have keyword arguments for all arguments
after the first one.
ShoppingCart tidy
corrected package naming error.
updated CtrlP
Add a Sigchild compatibility mode (set to false by default)

This mode is required to use a hack to determine if the process finished with success when PHP has been compiled with the --enable-sigchild option
Add FreeRTOS-Plus CLI library
initial sources revamped & README-ing
sources & tests revamped
litt bedre talk/show og talk/index
Fixed typo in eclipse project name.
Made BlockPrint more efficient; added unit tests

* Removed GenericT4Generator. The T4Generators now work like
  GenericT4Generator used to, instead of requiring implementors to make
  a derived class.

* Made BlockPrint calculate the indent as it went, rather than basing
  everything off of the first indented line. This makes it more robust
  and simpler.

* Unit tests for BlockPrint were modified to accomodate its different
  behavior (the exception numbers were changed).

* The regular expressions that T4Generator uses during BlockPrint were
  changed, given comments, and made public.

* A new class, IndentStyle, was added, which is used essentially like an
  enumeration. It has a very restricted range of values, and instances
  can be compared with each other using object equality. The T4Generator
  has an IndentStyle property, and will throw an error during BlockPrint
  if it sees an indent which is incompatible with its IndentStyle
  property.
Add bash script to launch the program on *nix
Add spec file to build proper RPM
Add RPM - I know I added a binary file to a repository - sue me.
Added copyright for my own content; preserved MIT
Add merge to Persistence

This allows the setting of multiple values at once.
got action sheets working and added colored buttons
Simple typo in error message.
Make customer ame biiger than address.
Interne fout in project opgelost
Revert "Solution changed for Visual Studio 2008."

This reverts commit 2df035b515f4e4eb3dc84bb80da9d6d9598df7d5.