labofsahil/github-event-dataset-2012 huggingface dataset:
[OPENENGSB-2076] applied checkstyle-conform formatting (except 'redundant' throws
in class LdapDao. They are not redundant.)
Total change. Ui under construction
added setup-filesets helper target def on phing build
Move to using the management ip address, as that is what should
be accessible from the XenServer

Change-Id: I2bbf144e37c43eb6af4e4e8e470ea58260417751
exercises/euca: Fix volume timeout

Fixes bug 1087656

In euca exercise, the timeout for one of the volume operations was
specified as ASSOCIATE_TIMEOUT, whereas the timeout error message was
mentioning RUNNING_TIMEOUT. This fix changes the timeout to
RUNNING_TIMEOUT so that it is consistent with the error message.

As RUNNING is usually larger than ASSOCIATE, it leaves more time for the
volume operation.

Change-Id: Ic016c7920ae6e4ec9a476bb5612b7df9eed01c75
updated to latests HTML5 boilerplate
Male hero chainmail
Support multiple Ruby 1.8 or 1.9 versions

- Cache gems by specific version number

- Share blessed_gems dir b/w Ruby versions

- Parse version for name of rubygems dir

Change-Id: I9edcd74254af8ee30989b419eef7657119c035b5
Merge "Support multiple Ruby 1.8 or 1.9 versions"
Improve error messages on failed gem operations

- Include stdout and stderr of processes run with
run_secure in log messages and raised errors

- Capture all Bundler output during Gemfile parsing

- Redirect stderr to stdout when run_secure is run
without secure users/groups

Change-Id: If4055cf7c52801bfc16e38e74a69321afcef2629
Support proxy for npm requests

Change-Id: Ibbb7e5c978e7b1247d4f794b336dc95af4a27395
Merge "Support proxy for npm requests"
Refactor gem task initialization

- remove the need to always run compile_gems before other methods

Change-Id: Idf5d85876a0617a8f1b606cfd410851aa0f337f4
Merge commit 'ec44c7f5c2d364e1dcc9de0f6136019cd2345566' into dup

Conflicts:
	lib/vcap/staging/plugin/secure_operations.rb

Change-Id: I22752cddf0786aaf96dbc5ab4219bba95e74c051
additional about page styling changes
Fixed Twig example.
Set of building blocks for maps
Fixed spectating in BW2
Adding end of TP5
Better handling of stale tokens (no more 401's)

There was a problem with stale tokens generating 401's. The
headers for the request where not replacing the stale token
with the freshly obtained one. This patch remedies that.

Change-Id: I8e7c7e01fddeec17ad9ff4254b1223820bb8e2b7
Merge remote-tracking branch 'upstream/master'
Upstream changes
all legacy posts imported and formatted
include category in permalink
New exercise: Z-scores 2: Reading a z-table
@beneater changes
New exercise: Z-scores 3
Angle Addition per Trello Card #418
changes in response to comments
minor formatting in code
minor change so everything stays in red box
Merge branch 'zScore2' of https://github.com/smenks13/khan-exercises

Conflicts:
	utils/stat.js
Narrower width for workarea and hints in dev mode to match width with scratchpad
Merge branch 'zScore3' of https://github.com/smenks13/khan-exercises

Conflicts:
	utils/stat.js
minor changes to presentation
Merge branch 'angle_addition' of https://github.com/Christi/khan-exercises
Fix tabs and rename to have "postulate"
Scheduler fixing, that's all for todayyy afternoon
Upgrade DN
Add Guava as dep.
Upgrade ARQ
Upgrade Ispn and HS.
Add sun.jdk.
Add default admin auth config.
Add more memory.
Split module tests vs. embedded wrt GAE API jar.
Add common as we moved tests.
Add MR deps.
Add tools tests.
sync with upstream
massive changes in image management, menu under image view
fix in scrolls
Changed naming in inst.h (sine -> sine_table)
Finish preparing manifest.json
Added an up_count input to counter.v
simplier & better responsive
Connecting to db
fixed incorrect view direction
Added initial revision
removed files and moved to other branch
Merge pull request #4 from danielkaneider/master

x64 platform for VS2010 projects
styling excerpt for front page slide show
enhance multi-layer problem
Added dates and made small formatting change to times
Far too many improvements to list
More changes again
msm: display: Add rotator bus scaling vectors for 8660/8960
Candidate object now includes a is_incumbent boolean
added inactive state when entering portal world
Macosx port
Added Google Chrome support by falling back to QuickDraw drawing model
Add windows (mingw32) support
Introduce a better way to find gstreamer plugins path
Set discovered path before scanning for gstreamer plugins
Fix misteruous crash on Macosx Leopard
Whoops
Use gstxoverlay interface to set nsview
Line interpolation through hole working.

Setup ignores.
Thicker line interpolation
Lots of new tools.
fixed a metric error
Respect DPI of loaded images optionally.  Modify LaTeX Preview mode.
Preview now generates double-resolution images; Emacs will respect DPI in this case.
update for bugreport
remove version id
Updated README.md fixed link typos
corrected the path of the rails script
Fixed table overflow. Therefore added class `tfixed` in css/style.css
Change to_python in JSONField to allow empty lists
Abstract submission working :+1:, but for "My abstracts"
Added Support lib Support
add previous_transaction function to StockTransaction
pull out fake report to a utility function for reuse
allow fake_report to take an explicit date and return transactions

- fix a test
remove checks that don't generate stock transactions for no balance change
fix reorder_amount
(cherry picked from commit 08d1cd3226f5e46f70689d1b921860f570546d03)

Conflicts:

	logistics/models.py
proxy collect fix
add example test
Merge pull request #460 from YuliaNikonova/master

NYProxy
Ignore node module dependencies.
Add failing test for destroyed records.

Also, generalize the previous test to use persisted? rather than !new_record?.
Also clear the destroyed flag after synchronizing.
Increased plugin number version

git-svn-id: http://plugins.svn.wordpress.org/wp-translation-box/trunk@626722 b8457f37-d9ea-0310-8a92-e5e31aec5664
Added another spammer who'd slipped through the net.
create password reset button
Updated index.py

Update of index.py, moved the code to get the creds into the
emailhandler
rm CHANGES
Non spice now also at least works and get dumped display on the web server
v0.017
Small doc modification
v0.004
Prevent points for allied kills from giving points in Event War.
Nullcheck and removing repetitive code.
Updated all cache references to correctly update when plot permissions change.
spacewar changes. improved AI
Light refactoring.
Fixed untitled name bug. More refactoring. Some text changes.
Final cleanup to range sets
Autocomplete Zotero archive field again
Add wysihtml5
Enable wysihtml5 in note admin
Enable wysihtml5 for documents; add base admin css
Render formsets on validation error

I had (stupidly) given formsets different names when the request type
was POST. This is the problem with implementing an all-custom admin,
then.
Make sure archive autocomplete is always triggered

It was only doing so on page load, leaving out situations where someone
added new zotero information, which is done by adding to the DOM.
hard-coded neo4j versions, as Play! has a hard time deciphering versions from active maven profile
added fixture data and basic parsing of candidate list
changed icons, added action bar
Estructures de dades i carrega automatica
add spm characteristics drawing
add loading signals from file
On IRC, user quazimodo suggested that we should indicate "outdated" pages...
Gelöscht
keine Zusammenfassug vorhanden
First draft to explain the "content oudated" message on some pages.
OutOfDate
no summary available
issue #74: add html expansions to web-mode.el
Merge pull request #76 from vmalloc/patch-1

issue #74: add html expansions to web-mode.el
Remove advice for js-mode
Merge pull request #77 from gvol/master

Remove advice for js-mode
* Insert the new constant name
Added arc configuration for Phabricator.
Changes author to proper github account name in phantom-runner post
Flesh out app. Add Gemfile
Refactoring of perception_process_module.

Got rid of the PERCEIVED-OBJECT class. It was replaced by
OBJECT-DESIGNATOR-DATA. Deleted many unused or deprecated methods that
worked with PERCEIVED-OBJECT.
Implemented an assign-obj-pos function
Changed constant numbers in predicates into constants from a fact-group
Fixed a small bug in semantic-map-height-generator.

When a point is not on an object, the sequence HEIGHTS will be NIL.
Then, RANDOM-ELT will throw an error. Handle that case by setting the
height to 0.0.
Merge branch 'master' of https://github.com/moesenle/cram_highlevel
Added a cost-function and a corresponding predicate for avoiding collisions
oos forgot bindings module
fix cucumber
Merge branch 'master' of github.com:ethanph5/CrowdPhotoEditor
Fragment checking fixed.
updating binary files
Merge branch 'master' of https://github.com/zombiepaladin/DungeonCrawler

Conflicts:
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj.Debug.cachefile
Merge pull request #3 from zombiepaladin/master

Updates
committing random binary files
Merge branch 'master' of https://github.com/zombiepaladin/DungeonCrawler

Conflicts:
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj.Debug.cachefile
Merge branch 'master' of https://github.com/zombiepaladin/DungeonCrawler
binary file upload
Possible fix for the Room issue
Merge branch 'master' of https://github.com/zombiepaladin/DungeonCrawler

Conflicts:
	DungeonCrawler/DungeonCrawler/DungeonCrawler.csproj.Debug.cachefile
Fixed an issue with stats that was causing it not to build
Merge branch 'master' of https://github.com/zombiepaladin/DungeonCrawler

Conflicts:
	DungeonCrawler/DungeonCrawler/Entities/AggregateFactory.cs
Merge branch 'master' of https://github.com/zombiepaladin/DungeonCrawler
Fixed a small bug.
Merge branch 'master' of https://github.com/dkellycollins/DungeonCrawler into Collision
Created Collision system skeleton
Very bad implementation of the collision system
Merge branch 'master' of https://github.com/zombiepaladin/DungeonCrawler into Collision

Conflicts:
	DungeonCrawler/DungeonCrawler/DungeonCrawlerGame.cs
Created a new property of the Player struct to store the player's race.
Changed the UI to be health/psi or health/fatigue depending on what race the player is using.
Merge branch 'master' of https://github.com/zombiepaladin/DungeonCrawler

Conflicts:
	DungeonCrawler/DungeonCrawlerContent/DungeonCrawlerContent.contentproj
adding the health/fatigue png file
fix url bug.
init tornado
Merge branch 'master' of github.com:fastturtle/tornado-linode
Merge remote branch 'sehmaschine/master'

Conflicts:
	grappelli/static/grappelli/tinymce/jscripts/tiny_mce/themes/simple/langs/de.js
Disable building docs, so slow

Signed-off-by: Daniel Farina <daniel@heroku.com>
IMPROVED for command (like C)
lock/unlock
text + default visibility
bam, sorted.
updated examples of usage
compile for java 5
set9
added slides for part 4
added references slide
Item11267: Document use of $VERSION strings

Configure should also capture alpha versions, whether declared using
parse, declare, or new.

Switch trunk to an alpha designator.  _999 for svn HEAD, so it's always
newest.

git-svn-id: http://svn.foswiki.org/trunk/EmptyJQueryPlugin@15975 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
fixed the problem with text and texts, however as it turns out the real problem why i am not able to properly update from the javascript is because of an issue in the javascript not assigning properly the owner_id. this issue must be resolved in the fluxtile side of things before we can proceed to resolving the rest of these problems. In the meantime, it is possible to start styling this junk, although that should also happen in the fluxtile side
cleaned up after deleted files
Murder responses
Changed: JSON-RPC library now uses HTTP requests instead of the TCP socket.
Adding a package for libhpc, not done yet.
inicio de metaExemplar
fuck the classpath
Merge branch 'master' of https://github.com/gabrielhidasy/Projeto-302

Conflicts:
	.classpath
MPI Setup For Simulation
latest
initial feed file
Use MD5 digest of flag/switch/sample names for memcache compatibility
Fixin up for puppet 2.6.x => removing create_resources at all

Here we aims to purposes:
# remove dependency to some new create_resources that is not good for stable puppet versions
# use good old IDE's completeion there where it should be

For example in create_resources' option IDE will not understand, what to complete and in case of normal mysql::config -- it will.
Add moar docs!
added some padding to style,css
Fixed margin in style.css
switched around poorly planned comment
Restructuring project to a spider module and a search module
Restructuring program to use requests, BeautifulSoup, and App Engine. Reworking OOP structure for a first acceptable draft program.
Initial commit
Removed first draft code and revised to use requests and BeautifulSoup. Need to work out url parsing, interpretation of robots.txt, and how to track a rank for each page. Finally, I will need to start dumping links to either a file or a db.
Added functionality to grab urls off page and remove duplicate urls on a page
Improved documentation.  Made set validation classes subclass of new Set abstract class
Set unit test
Moved setConfig tests to the SetTest
Implemented a Set abstract class for the functionality common to all Set-validation props
Documentation updates
Added UK phone validator
Unit test for PhoneUK validator
Style fix.
Improved check for createDatabase.
chat notice time
[XCOM-2075] Added reload polling
Merge pull request #5 from aantonov/XCOM-2075

[XCOM-2075] Added reload polling
[XCOM-2269] Moving from Jeweler to Bundler for gem creation
Merge pull request #7 from aantonov/master

XCOM-2269
Increment updates
Added list figure options to the ViewByOptionsListViewController to handle the different list options for displaying the figures.
Added commenting for all existing code.
- Removed old module
Revert "Update to flexmock 1.0 which fixes Delegate issues"

Unfortunately flexmock 1.0.0 is not Ruby 1.8 compatible, while Tracksperanto
should work on 1.8.7 due to perpetually crappy, outdated, shitty Linux distros
mandated by high-end post apps
Beaucoup de modifications : graphiques et dans la code source.

Signed-off-by: Dylan <dylan@Thekiwii-PC.(none)>
functions mod.
Added settings seed & optmized a few row counts
cal0828
Added the sorting steps definition.
Changes to do the application as hdiv-spring-mvc-showcase
Logo position and name/title line height updated
end of 3.9
Added a new script to check for simple low-threat malware.
removing clubs from request because we can't currently support it
调整 clojure.string 相关的文件
调整 clojure.core 文件位置
添加 pmap 函数
添加 pvalues 函数
添加 pcalls 函数
fix pmap
fix problem-of-pcalls-and-pvalues
media query #thumbs updated to .thumbs
fonts changed to em
Ankit/Nagaraj: IdeaController created
Merge branch 'master' of https://github.com/iliasbartolini/twu28a_mib
migrations
Merge branch 'master' of github.com:infernalmaster/canactions
switching to python 2.7
set itempadding height to 640px (re #121)
Lots of work

Added lots of preferences, added a swipe gesture to open menu, removed test function, no longer need to build libraries

Signed-off-by: Beecher Adams <koalaos127@gmail.com>
No need for Makefile, it's all rebar now
removed todo
Merge pull request #325 from AlanRosenthal/AR_Issue303

removed todo
Fixed .gitignore for .orig files
Merge pull request #228 from stowellm/ms224

Fixed .gitignore for .orig files
removed check of zlib dep (pc file not present on SL distros)
Add count 1077
Add count 839
Add count 900
Fixed for JDK 1.6 based one.
fixing named anchor
fix gauges id
Added --testing flag to release script to make non-official releases
Added cachedb files to .gitignore
Added install.sh script
Change to generic tvgids epg source

- Refactor EPGSource to be generic (not TvGids-specific)
- Add timestamp to stdout and xmltv output
- Use generic TvGids instead of legacy classes
- new config file format 4
- store hsqldb database location in config file
- add --clear-cache option
- allow nice-time-milliseconds to be set using --configure
Release 0.9.0
Add additional browser to test in Sauce Labs.
Add initial git code, some layout, tests
Add WebKit dependency
Adding merge conflict changes again. Working on comments in canvas.js
Replaced busybox netcat will standalone version (busybox version is very primitive and unreliable).
removed github from search results, since it only contains my older (and thus more embarrasing) code, and will do so for the foreseeable future (working on client projects and a closed-source game)
Latex Math syntax check
[maven-release-plugin] prepare release warnings-4.10
delete sub module
add git sub module
Cleanup of export_from_date
mach: memory.c from Code Aurora android-msm-2.6.35
mach: memory.c from Code Aurora android-msm-2.6.35
fixed bug not responding server
adding ruby extconf.rb in the rubysource/ext/openssl directory to hopefully resolve some "openssl not found" issues
returning false from handlers
Added Jquery and Underscore
config update
mailer
config update
refactored the js dropdowns
"snippets update"
Merge branch 'master' of heroku.com:afternoon-fortress-5076
update
Add support for vlc

Support is tested (compared with Rhythmbox) and everythin is working as expected.
Regenerated model class files, added UIImage for transformable attribute
First attempts at VBO
give correct URL for ISS passes
1차 1부 교육자료 추가
Make farming mod better
- Typos hurt me!
Update Formula/php-cs-fixer.rb

fixed sha1 checksum
added static pages controller
all tests pass
starting chapter 4 all tests pass
Chapter 4 starts
Chapter 4 starts
Funguje pozyvanie
conflict
An die Seite angepasst
Proceeding with an implementation of the pivot table
My name is...
Teamates names...
adding new.txt revert removed it
updating main.txt w/ merge
started this shit
Our webpage now using requirejs to load javascipt
Our webpage now using requirejs to load javascipt
Add `mSharedMemoryID' field to WorldOptions struct

This field was introduced in SuperCollider 3.5 (commit
be279fbbd02ad8405ef4e9c0383a1f1426e9fa88).
Add ChangeLog
Update the install dump templates
s/testsuite/test suite/g
another typo
dzil test --all sets all three environment variables, for convenience
Revert "modified paperback look"

This reverts commit 90a65b3771418021ae002dc33c5eb1348b38347b.
changes to chart on paperback
Merge branch 'master' of https://github.com/karltrout/TrainingPlanner

Conflicts:
	src/trainingplanner/FXML/PaperBack.fxml
	src/trainingplanner/FXML/PaperBack.fxml.bak
Sat, 15 Sep 2012 12:00:05 GMT
update factories.rb and seed.rb
Added not_all_zeroes filter to asti_data rows
Edited twitter div css
Removed info bubble from scripts.js and added link button to nababaha report a flood
Bug Fix

fixes #2
add: test header
extract: utils
switch to solarized-light as the default
Preparing sending of invoice using email. Restructured reports menu with submenues
Moved id conversion and duplicate checking for event pokemon to get-serebii-eventdex._js
Add the event pokemon index for event moves in learnsets.js
Convert unknown nature data to any nature for event pokemon
Add 'beans' to xmlns
LDAP customizations
Plein de choses de faites
order domain/services are added
Memory based OrderService is added
lunch order 1.0
export date/time as well
send to all chans
Well my last commit fixed it!
Except there's no questions for some reason, which is odd because I still had them when I tested it on my server, unless someone deleted them to try fixing~
small test for shiny pokes
Google Ad adapter now working at 98%. Setup test ads for google ads. Added dynamic adapter class method response checking for ad adapters like google ads. Updated README.
edited azure timing
:gem: Added travis.yml file :gem:
:gem: Travis CI image/link in readme :gem:
Merge pull request #1 from travis4all/clean

Such a compelling argument...I couldn't look away!
working through czar logic
Merge branch 'master' of https://github.com/lefthandedgoat/multi-libs
amir jquery tmpl
amir jquery tmpl
Added polling to index to find games
czar implementation
Merge branch 'master' of https://github.com/vpalivela/multi-libs
Merge branch 'master' of https://github.com/lefthandedgoat/multi-libs
removed create game link in the game play page
Removed labels for game started
working throuh czar functionality
removed comments
Merge branch 'master' of https://github.com/vpalivela/multi-libs

Conflicts:
	Web/views/game.ejs
pulled in styling
trying to populate czar's carousel
Merge branch 'master' of https://github.com/JustinJohnWilliams/multi-libs
adding logic for winner
czar card ready for selection
Merge branch 'master' of https://github.com/lefthandedgoat/multi-libs
Merge branch 'master' of git://github.com/amirrajan/multi-libs
basic typeahead implementation
fixed index.yaml
fixed typeahead JS for future
clean unicode for search
merge with master
typeahead styling fixes
index.yaml needs to stop changing
index.yaml needs to stop changing
letting index.yaml update
merging
changed to non user-facing url
css never got compiled from .less
last comma shouldn't show unless 4 teams listed
disallow ajax things from robots. Issue #152
only get json on focus
Fetch autocomplete data once. Dont autocomplete with browser data. Some formatting tweaks to autocomplete
Remove busted year=" index, fixes #9 harder.
Single thread paver data uploads. Fixes #155
Template improvements, and an inexplicable index update.
Remove bad model imports from API. Crank API caching time way up.
概率论作页
a joke
Merge branch 'master' of github.com:leizongxiong/leizongxiong

Conflicts:
	README
refactored view
remove read more link
add icon next to headline
removed uneeded icons
changed icon to "read more…"
added icon in side navigation
Fixed bugs.

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Created User, UserGroup entities. Updated packages.config.

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Fixed packages.config files.

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Added some new entities.

Signed-off-by: Lien Pham <insaber2309@yahoo.com>
Merge branch 'lien' into tien
Added and modified some entity classes.

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Fixed bugs.

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Fixed PhotoAlbum entity class.

Signed-off-by: Lien Pham <insaber2309@yahoo.com>
Fixed conflict file when merging tien/tien branch.

Signed-off-by: Lien Pham <insaber2309@yahoo.com>
Fixed .csproj

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Fixed OneToOne error.

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Removed MailFolder class.

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Merge branch 'tien' into experimental
Created new entities (full).

Signed-off-by: Lien Pham <insaber2309@yahoo.com>
Fixed conflict files when merging 'saberlily/lien' branch.

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Fixed all entities (Still updating...)

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Modified README.markdown file.

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Merge branches 'tien' and 'readme' into experimental
update D3NetworkTest
Use incoming browser commands from core 1.2.1
A bit more logging
Use Session#addPluginFolder to load plugins
Session#handleChange now accepts root and relpath
upgraded contrib modules and drupal core to latest versions
First commit
Merge branch 'master' of github.com:lkwebudvikling/raptekster
again the same typo in one of the css files
Add ActiveSupport as a dependency
Tweak warning regarding leaking libpq Results
added text in tag `<h2>`
Luke: ingestion now handles dataset creation
Luke: unifies datastore_name

Maintains consistency between ingestion processes and the dataset for
datastore names without introducing state into the processes.
removed no memory limit
it doesnt exaclty have to have a space
RAR: Make check_huffman() less greedy (I had a false assertion-fail, for an
invalid data stream)
RAR: Correct BINARY_SIZE (it should be zero!)
Raw-SHA1-ng: Set min_keys_per_crypt to 4 to avoid unnecessary performance
hit in Single mode.
Add support for cracking STRIP Password Manager databases
Merge branch '1.7.9-jumbo-6-fixes' into magnum-jumbo
Merge branch 'magnum-jumbo' into bleeding-jumbo

Conflicts:
	src/rawSHA1_ng_fmt.c
Add SHA-256 OpenCL kernel.
Fix a crash in ssh2john.
Add another test vector in SSH format.
Implement changes suggested by Solar.
Added a new rule, to reject a word unless it is a specific length. This could
be done in the past with 2 rejection rules. Updated the doc/RULES file, and
rules.c. Pretty trivial code change.
Merge branch 'magnum-jumbo' into bleeding-jumbo
IPs database update to version 1.211
IPs database update to version 1.190
beta logo with transparent background
fixed about and contact links
Merge branch 'master' of github.com:malteseunderdog/fielderic
Hopefully fixing FuryAndFuryFit tests on Mac and WinXP.
retina 4 update
SDK bump for MBTiles fix
Added items to navigo controller
code lookover
Added xml file for testing
Bump api version in #usage section
fix for issues #493 CSS fix for super old browsers

--HG--
branch : beta
add commit messaged and gravatar to split compare view

--HG--
branch : beta
Correct typo in document name
minor Product refactoring
Merge remote branch 'origin/master'
Still cleaning
broke up tui tests into single tests
edit README
no aws credentials
config.yaml dummy
untrack config.yml
edit small things in bootstrap.sh
output with dummy
a small waiting in bootstrap.sh
filter updated
delete tmp files
Minor changes.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	input/amis.txt
	output/output_ami-6fa27506.json
Patch readline for ghc 7.6.1
Sync readline with portage, portage version has no cabal dep
Bump blaze-builder-conduit to 0.5.0.1
Bump tls to 0.9.10
Bump ghc-syb-utils to 0.2.1.1
Bump yesod-core to 1.1.1.2
Bump yesod-form to 1.1.1.1
Add date-cache
Bump asn1-data to 0.7.1
Bump warp to 1.3.1
Bump attoparsec-conduit to 0.5.0.1
Bump authenticate to 1.3.1.1
Bump certificate to 1.2.6
Add cipher-aes
Bump clientsession to 0.8.0.1
Bump clock to 0.3
Bump conduit to 0.5.2.4
Bump configurator to 0.2.0.1
Bump cookie to 0.4.0.1
Bump cprng-aes to 0.2.4
the cart is the bane of my existence
Added License info

Apache 2.0
Working updating of added/removed entries in calendar.
Cleanups.
Added capturing of new nodes from calendar.
fixed alchemy nosetests
Set rpc_dplx_rec pointer members to NULL.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>
Missing compiler bool fix (rebase me).

Signed-off-by: Matt Benjamin <matt@linuxbox.com>
Prototype xvrec.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>
Allocator cleanup.

Don't push allocation up to client.  The approach taken by
Ganesha to use external jemalloc or tcmalloc allocators will
magically work.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>
Added the application directories.
added missed and extra files
title field check
rights fields check
JACKPOT. pypy runtime down to .5s
LPS-25465 All MainServlet initialization logic moved to InitPortalUtil
LPS-25465 Follow same pattern that in RegistryUtil's: register method always puts
first iteration of holding page finalised
Fix validation.
remove unused webfont
Merge pull request #18 from meleyal/patch-1

remove unused webfont
No, really, fix another typo

This is what 45352a37ef8bdae0b5dc014760a6b29867016da4 meant to fix.
minor modification to the privacy policy
Add ShadowActivity.recreate. This is useful for testing orientation/configuration changes and is available as part of Honeycomb+.
Added script for registering but not unregistering
Updated docs with missing info on 'max_page_rows' option
Added an extra space between terminal prompts for readability in theme
Dodano pierwszą wersję bazy danych.
Added html5 support to syntax and indenting.
use sequence in robot movement. but some bug!

There is some bug in Sequence::addPose().
It looks really hard one!
fix bug. but some bug!!

the bug is just buffer overrun(not stop by some reason) in one step ago...
but robot don't move, so there is some bug
edit SequenceMovement. robot can move.

poor performance, but able to make pose.
required: saving project, copy pose to other slot and sequence ediotr
Use the new base layout.
GCAttribute: Don't postpone setting value, it'll just cause race conditions
GCObject: @synchronized _validPropertiesByType & _defaultColors; reorder property lookups to check validProperties first
GCTag comments
GCContext: property arrays should not be mutable; use KVC internally
GCChangedInfoAttribute doesnt have a value
Internal KVC/KVO rewrite + moved to its own file to avoid cramping GCObject.m; fixed property.describedObject problem by using mutable collection accessors on generated objects; make it harder to attempt to init the wrong GCObject; prelim predicate work; minor tags.json update
logging/comments
comprehension tests redesigned
Base CodeIgniter 2 Setup

Base codeigniter 2 set up routing to registration page
Added a gitignore for OSX and Ruby files
Fixed tab formatting
Added new article for my Intro to Git talk at OKCDG
Really fix the formatting this time
Fixed issue Quiz view
modified top of single post
fix displayed version
fix font size for Extensions Manager
fix J!3.0 templates
se corrige la formula del indicador de tiempo para contestar una llamada
DRYed up the test code with the rails let method
minor: authors++
added GoSquared monitoring
replaced old html files with newer haml files
updated version and author in setup.py
Merge branch 'master' of https://github.com/morrissimo/NWS-CAP-parser
remove test only pull
Add shadowOpacity (maximum) and shadowColor as properties to allow customizatio
afegida imatge detall projecte cogombre
afegida imatge cogombre a detall projecte
Buggy ward/room/bed combo boxes fixed up

- Still an issue of duplicates showing up sometimes.
scala 2.10.0-RC3 support
Created some of the PHP files and templates used for the new validated survey question
Created first working version of validated type answer, using the mugo validation type
Devkit version to 3.3.0-EA
Modify IDEA settings for project.
Clean up pom.xml, and add latest versions to it.

For checking updates of maven plugins/dependencies
$ mvn versions:display-plugin-updates
add DoctrineORM
Add gem "aws-sdk"
Updates that allow all basic models in plm() except for fixed effects to work. Demos and doc'n altered too.
Add table, save login and search page, property file
Added <thead> and <tbody> to tables
Fix REST tests
Add test for service locator
Fix REST tests
removed HTTP check
minor: Add some currently commented out debug log lines for investigating issues resolving group IDs for land parcels on OAR loading where groups do not exist
Josh's editing of typos and rewording etc.
Fixed a tilde
Merge branch 'master' of github.com:nelfin/mc-aixi-ctw-report

Conflicts:
	report.tex
added permission for matrix edit
strict and unnatural looking path following
more sdl removal
Added solr engine with sample data, added search capability talking to SOLR engine and wired to type ahead
updated readme
Tests passing. Added conditional statement to the _table.html.erb.
Added tests to presenters.
SAKIII-5661 - Filtering out the server objects
Tried to automatically advance anaconda partitioning menu with custom layout pre-selected

* Hidden all other options
* Deactivated both checkboxes
* Checked "Review and modify [...]" cehckbox
* Manually advanced the setup (I hope)
* Whispered a prayer to ancient gods
Added pylint.vim
Bug fixes + adding placeholders
Initial code re-factor for mainapp.js, rest.js, slicer.js, downloader.js [WIP]
Proper tourney
Merge branch 'master' of https://github.com/no-man-is-an-island/4play
Removed `chef` from the gems for the project. This isn't required for the actual project - I mistook this for needing it to be installed locally to run the `knife` command.
Updated README
catalyst_pxp blacklisting fglrx and radeon
Removed second RemoveBinding method

Index isn't a reasonable notion for FullInputManager, and I don't see
why someone should have to know the internal position of the binding to
remove it.
FEATURE Added ability to select multiple types to search on for a single search
refactored report format types. added support for the --html-copy-data option to the html reports
updated with pages, projects and numerous other fixes
Implemented JSON Node Parser.
BOA: Some contrib upgrades (Robert)
BOA: Explain how _NGINX_FROM_SOURCES=YES affects _BUILD_FROM_SRC=NO (Robert)
* enhanced the BMECat12Test.java
 * changed BMECat12Test.java to test import throughput of 100.000 items
Fix previews for file uploads.

File uploads need to be saved first.
Can reuse the instance + queryset arguments again,
now that the proper proxy model is used in the preview.
preflight checks for all graph builders, fixes #665
fix arrive-by frequency trips (I hope)
Did some debugging to figure out why mirrored rasters fail
Fixed conflict
Update API documentation for v0.16
Making assertion clearer if it fails
Add section to README about proxy
[PAXEXAM-453] use TomEE 1.5.1
committed example files and readme
fix error in GetPubVarInfo
RID: 1.1, 1.2 m:Made the CreateTable-file compatible with the new server
and database.
RID: 1.1, 1.2 m:The add_book script (server side) now adds all the input
parameters.
apps make file
Websockets are working
Adicionando imagem e mudando titulo
Added LICENSE.txt
Removed MMPL-1.0.txt
Changed licensing for mod to final version used prior to release
Updated figs + tex
Finish initial i18n
Fix formatting
Use one symbol map representation for game_state
[#6] Fix up people page on IE.
[#6] Fix up columns for IE.
[#6] Update templates with modernizr.
Anexados Formularios IIIa al IVb
Update app/models/user.rb

Update Paperclip filename attachment on user Model
Redirect the previous download page to the new one
comment left indentation whitespace
redis increments and stats
bump for new datacollection entries
Updated counts in DataCollectionConfigParserTest.
Added linkd Test and snmp walks for Nms 10.55
Moved graphcontainer addlistener call due to some vaadin weirdness
move x,y into layout classes and move graph class into graphContainer
move x,y into layout classes and move graph class into graphContainer
version changed
version changed
Merge branch 'boston'

Conflicts:
	pom.xml
	test/functional/pom.xml
	test/unit/pom.xml
Merge branch 'master' of https://github.com/phresco/android-hybrid-hw
Force requirejs to load all spec files by absolute paths.
update test for membership
Merge pull request #5 from anilsaldhana/master

see comments
Spring Integriert
Dont change permission, and initial invoke develop
added method to return offlinecause
Merge remote-tracking branch 'pmsipilot/master' into offlinecause
Merge pull request #18 from agallou/offlinecause

added method to return offlinecause
change google author info again
Tumblrログイン修正。
add random deviation to the unit movement
Merge branch 'animation' into dev
Merge branch 'dev'
Updated App with Suggested changes
fixed layout issue where second page+ of albums images were aligned with header
styling stuff
images for buttons
Updated readme with auth_type LWRP method, small updates here and there
Antwort auf Frage
Enum für WHITE und BLACK: groß geschrieben, damit Konstanten einheitlich sind
comments anchors; translated submit button
show only 'received_comments'
Unit Tests: Correcting Factories data refs:  #303
(#14457) Add FreeBSD support for the NTP class
Merge pull request #15 from Whopper92/FreeBSD_Support

(#14457) Add FreeBSD support for the NTP class
Added support for using only GPG passphrase
small corrections
Siddique's amendments to raster prac
use suburbs, not streets
Update test selenium case 1 and 14
Clarification/Consistency
Support for JDBC for Oracle added
remove cached template loader as it's pointless and potentially leaky
0.5.10
add news to searchResult.jsp
Merge branch 'master' of github.com:randyzhao/THUSearchEngine
add news
Removed fabfile/boilerplate.
settings deleted
pull request merge
resettable date
make client return a nokogiri document as response. accepts a block for building the request
Minimal fix for missing decoding of the MIME message body.
new maker: ext, help, plg

Signed-off-by: Renan Abreu <renanhabreu@gmail.com>
email miti
credit anomaly detection

Signed-off-by: Reyco Evangelista <reyco@clickinglabs.com>
Add note about couchapp tool
worked on generating the metadata series.
worked on sms classes.
updated documentation on installation
started creating a fab function for checking out and compiling extra_code
tweaked the wsgi process settings
Correct name for cameraOribt
Import db, optimize core.mk.

Signed-off-by: Horváth Balázs <qqroach@riftworks.org>
add mime type for image/jpg
TRUNK-3501: Show helpful message when purging in-use Field Types
Merge pull request #8 from robmiles/master

Show helpful message when purging in-use Field Types
TRUNK-3706: Changed encoding from UTF-8 without BOM to UTF-8 with BOM
fixing server --watch
lk-build-libs: both debug and minified versions are build + adding jquery-bounds addon
add ca translations
add ca translations
Merge pull request #139 from kuert/master

Update ca translations
Fix typo
Remove the default value for the impersonating route
update ca translation
Merge pull request #141 from kuert/master

Update ca translations
MongoDB ompatibility
Merge pull request #143 from giorrrgio/bugfix2

MongoDB Compatibility issue
Removed parameters from services and added configuration options with defaults from old parameters.
Updated configuration to match discussion between Thomas and I.
Used array_replace_recursive instead of array_merge for the defaults in the DI. Moved some defaults to the configuration.
Fixed config error with no children() specified on arrayNode.
Merge pull request #145 from BallisticPain/pr_parameters_to_config_options

Removed parameters from services and added configuration options with...
Fix configuration issue introduce by fcec11
Merge remote-tracking branch 'master-sonata/master'
updated to reflect policies
Initial import of sources
Just setting a restore point in case this gets hairy
- Basic monitoring service for service-level usage auditing
Added new tab for received events
Learning Markdown - Changed Readme
added nav menu support
Created an instance of client in the module
A few more blog posts
* Correção na excessão do jquery mobile.
* Modificado driver mysql (para não acontecer alguns bugs do driver antigo).
* Percebi que o sistema não ia funcionar da forma que estava trabalhando,
  pois preciso enviar todas as 5 tabelas do lançamento de inventário de uma
  vez para satisfazer a chave estrangeira, e ter um novo webservice para
  tratar essas informações.  Para tanto comecei a re-fazer a tela de lançamento
  de inventário e webservice.
* Modificado driver mysql (para não acontecer alguns bugs do driver antigo).
* Percebi que o sistema não ia funcionar da forma que estava trabalhando,
  pois preciso enviar todas as 5 tabelas do lançamento de inventário de uma
  vez para satisfazer a chave estrangeira, e ter um novo webservice para
  tratar essas informações.  Para tanto comecei a re-fazer a tela de lançamento
  de inventário e webservice.
deleted setting auto_download because will alway auto download when fetching the lyrics of the next song
xbmc supports embedded uslt through musicplayer.lyrics, no need to do it ourselves
Rebase from 'upstream' @ version '1.9.1'
Get rid of singleton dimensions in StackResults.py
Posting script and Casper Extension Attribute to check Gatekeeper status

Posting script and Casper Extension Attribute to check Gatekeeper
status on 10.7.x and 10.8.x Macs. If Gatekeeper is disabled, script
returns "Disabled". Any other status will result in script returning
"Active".
Aded file to mongodb
Mode-line: fixed time-in-range? check

Signed-off-by: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
work on android scrolling event
fix grails version and release plugin version
Arreglos para distintos tipos de reporte
Adding UPC-E image
init commit
Merge branch 'master' of https://github.com/ryanmunger/restaurant_app
adding post for electronics kit
Explicit handling of Null for countable arg
Merge branch 'py3compat'
Simple Dialog to create tags in geany
cfq-iosched: fix locking around ioc->ioc_data assignment
Require the new libraries
product single page etc
Page table initialization done properly. Passes proj.2 tests
Initial Commit
Implemented the basic Test User functionality.

Facebook (Testuser) authorizeTestUser:appAccessToken: generates
a test user using the Facebook Test User API. The returned user
object is then used to simulate the Facebook delegate method
Facebook fbDidLogin if a delegate is set to the Facebook object.
Merge branch 'master' of github.com:samsoir/facebook-testuser
Included supporting libraries and headers

The following libraries and header files are required by this
category to create Test Facebook users. This includes the
Facebook SDK and Google Toolbox for Mac HTTP Fetcher.
working contact form configured to email Ed
Merge branch 'develop' of github.com:sarahreid/chosenvalemusic into develop
Added in main menu possibility to click on labels t
Update lib\CustomTools.py
Add EL, LP, CS Function and Client Refactory
Add Download and Upload Handler Thread
Change Structure
Remove .pyc
Fix Bugs
Merge branch 'develop'
Fix doctest in PLS.
DOC removed irrelephant/confusion reference, added pointer to source (as there is no other possible reference).
Update for travis tests.
Some small fixes from the pull request.
File format NEV compat
gave admin the ability to delete posts, comments ( and also non admins
can delete their own posts )
Ajout du suivi des utilisateurs
Ajout du schema de la bdd
Intégration de popup cliquable sur la page d'accueil
Intrégration d'une template
Modification de la page d'ajout. On n'utilise pas la maps mais un champs ville
init maven project
maven refactoring
adding twitter bootstrap
adding bootswatch cerulean theme
Adding CFP submission form
adding submitter email
adding REST service (first version)
adding infos about TomEE+
Populate database with 2 CFP
Adding knockoutjs
Display submitted talks with JQuery and Knockout
You can now post Cfps
adding favicon
Script to execute phantomjs version of YSlow
Merge pull request #1 from shane-tomlinson/escape

Move the requiredEmail checks from resources/state.js to controllers/dialog.js. 
strengthen email/URL validation: require the objects to be strings
Add additional tests to check whether requiredEmail, tosURL and privacyURL parameters are passed to "start" when expected.
Generate static site
ver 0.30
Wersja ostateczna - o ile nikt nie znajdzie żadnych błędów. Zostanie jeszcze jedynie dodany plik help. Proszę o testowania (haha dobry żart)
Worked Url Check
fix flashws_check shim

Local shims should be specified relative to the package.json file
fixing zooms a bit
android, lowmemorykiller: remove task handoff notifier

The task handoff notifier leaks task_struct since it never gets freed
after the callback returns NOTIFY_OK, which means it is responsible for
doing so.

It turns out the lowmemorykiller actually doesn't need this notifier at
all.  It's used to prevent unnecessary killing by waiting for a thread
to exit as a result of lowmem_shrink(), however, it's possible to do
this in the same way the kernel oom killer works by setting TIF_MEMDIE
and avoid killing if we're still waiting for it to exit.

The kernel oom killer will already automatically set TIF_MEMDIE for
threads that are attempting to allocate memory that have a fatal signal.
The thread selected by lowmem_shrink() will have such a signal after the
lowmemorykiller sends it a SIGKILL, so this won't result in an
unnecessary use of memory reserves for the thread to exit.

This has the added benefit that we don't have to rely on
CONFIG_PROFILING to prevent needlessly killing tasks.

Reported-by: Werner Landgraf <w.landgraf@ru.ru>
Cc: stable@vger.kernel.org
Signed-off-by: David Rientjes <rientjes@google.com>
Acked-by: Colin Cross <ccross@android.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Conflicts:

	drivers/staging/android/lowmemorykiller.c
Linux 3.0.38

Changelog: http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.0.38
Some cleaning and more stuff for the demo
Still more cleaning
- developed youtube functionality so that items can be added to memory
walls-
- showing memory walls now shows amazon and youtube items with the player
- added more tests for youtube, mediaapi
Added stop words list. Now removing stop words from the documents
bugfix: return from switch now works as expected
Adding Max's new maps and transparent main map
added reviews and rating functionality
Added the builtin CloneSpace.
fonctionne mieux
Documentation and adding arbiter data pointers
added details about keynotes
Map View is pretty much complete with code cleaned and easy to read. Added new images with original photoshop files and extra icons
added object to store each task info, and refactored total info properties into one object
add salmon endpoint discovery
Fix failing tests on Jenkins

Signed-off-by: Fred Bricon <fbricon@gmail.com>
Fix failing SeamConfiguratorTest

Signed-off-by: Fred Bricon <fbricon@gmail.com>
JBIDE-13001 : fix randomly failing test

Signed-off-by: Fred Bricon <fbricon@gmail.com>
Updating composer for Symfony 2.1.*
Updating composer to set the compatibility to dev
Added multi-sitemap capabilities
Updating form types to fetch new requirement of Symfony master-dev
Updating form types to fetch new requirement of Symfony master-dev
Updating form types to fetch new requirement of Symfony master-dev
changes for two chat boxes
(#16333) Override AR MySQL connector to set sql_mode

Currently if there is a problematic sql_mode set globally it will end up
breaking things. This patch overrides the configure_connection function
of the MySQL connector to explicitly set the sql_mode to traditional for
the session so that if something that breaks the queries used by the
console (like ANSI_QUOTES) is set globally, it won't affect it.
Modified to add the additional behavior in a saner way per dpittman's suggestion.
Make SQL status query more PostgreSQL-friendly.
Verbosity++ for puppet:plugin:install rake task

 * Making rake task output more informative.
(maint) fix failing tests

Prior to this commit the reports controller specs were failing because
the instance variable @errors was not available to the spec tests. This
commit creates an accessor and uses that in place of the @errors
instance variable in the view and the specs.
Handle out-of-range and bogus pagination inputs.
Merge pull request #136 from jeffweiss/fix_session_killer

(maint) fix failing report controller tests
Update VERSION for 1.2.14
Merge branch '1.2rc'
Unit tests for out-of-bounds-pagination.
Now that we ship 1.8.7, we can build for el5

This commit adds a mock target for el5.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
Merge pull request #138 from MosesMendoza/maint/master/add_el5_to_mocks

Now that we ship ruby 1.8.7, we can build for el5
Merge pull request #126 from vholer/master

Make SQL status query more PostgreSQL-friendly.
Merge pull request #133 from adaburrows/verbose_plugin_install

Verbosity++ for puppet:plugin:install rake task
In will_paginate 2.x, default per_page is hardcoded 30.
Merge pull request #137 from sodabrew/patch-1

Handle out-of-range and bogus pagination inputs.
Merge pull request #120 from kfjohnson/fix/master/16333-sqlmode

(#16333) Override function in AR MySQL connector to set sql_mode
Merge branch 'master' into rails3

Conflicts:
	VERSION
	spec/controllers/reports_controller_spec.rb
It is will_paginate v3 on this branch.
Added my own font for icons etc
Added my own font for icons etc
OPEN - task 11: ClassPageRule in PageMeta processing 
http://github.com/soluvas/soluvas-web/issues/issue/11
Merge branch 'master' of git@github.com:soluvas/soluvas-framework.git
Including inner JObjects on getSurvey()
MOD: Changed styling of email links to accommodate changes in TBs default theme.
MOD: Pref useSingleTabMode changed to useMultiTabMode.
MOD: We now use our own tab prototype "cota-tab" instead of "chromeTab". This makes us independent of changes to chromeTab and it's CSS.
cota.TabMonitor manages the content of the cota search field similar to

Gloda search:
- if the user switches to a cota tab, the search field will contain the string
  used to find (and open) this contact.

- So, if the user has two  cota tabs open, the search field will contain the
  search term for the current tab.

- If the user switches  switch to a completely different tab, say a folder tab,
  the search field is emptied.
Added libs:
  - SSO (endorsed/*)
  - Connector/J (lib/mysql-connector-java-5.0.7-bin.jar)
  - JDBC Connection Pool from Tomcat7 (lib/tomcat-jdbc.jar)
Merge branch 'tomcat6' of github.com:spigit-inc/tomcat-package into tomcat6
added source to repo and update source in spec file