labofsahil/github-event-dataset-2012 huggingface dataset:
Improve ImportDialog text constants & code
merge_into_dev_4_4-broken-conflict-needs-fixes: PR 512 (Display bulk annotations in web image viewer, new webgateway API calls)
merge_into_dev_4_4-broken-conflict-needs-fixes: PR 530 (Orphan)
merge_into_dev_4_4-broken-conflict-needs-fixes: PR 536 (Insight import location)
merge_into_dev_4_4-broken-conflict-needs-fixes: PR 538 (OMERO.tables ArrayColumns #5632)
merge_into_dev_4_4-broken-conflict-needs-fixes: PR 539 (Fix initialisation of username on Windows)
merge_into_dev_4_4-broken-conflict-needs-fixes: PR 545 (Jshint compliance 9927)
merge_into_dev_4_4-broken-conflict-needs-fixes: PR 548 (Multi annotations)
merge_into_dev_4_4-broken-conflict-needs-fixes: PR 552 (Channel naming 100022)
merge_into_dev_4_4-broken-conflict-needs-fixes: PR 555 (Correct small typo in CLI group help.)
merge_into_dev_4_4-broken-conflict-needs-fixes

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 512 knabar 'Display bulk annotations in web image viewer, new webgateway API calls'
  # PR 530 jburel 'Orphan'
  # PR 536 scottlittlewood 'Insight import location'
  # PR 538 manics 'OMERO.tables ArrayColumns #5632'
  # PR 539 bpindelski 'Fix initialisation of username on Windows'
  # PR 545 will-moore 'Jshint compliance 9927'
  # PR 548 jburel 'Multi annotations'
  # PR 552 will-moore 'Channel naming 100022'
  # PR 555 mtbc 'Correct small typo in CLI group help.'
Repository: openmicroscopy/bioformats
Updating 03770c0..52aceda
Repository: ome/scripts
Updating 3587c87..cf9c3bc
Repository: openmicroscopy/ome-documentation
Updating 858e9f2..790ea3b
Merged PRs:
  # PR 179 sbesson 'CLI documentation'
  # PR 183 sbesson 'Fix links to Numpy/Scipy downloads page'
ajouté deux fichiers, lance le test avant pour remplir le bdd et après
 le "main" pour afficher la liste des voiture/un voiture par Id (il faut
qu'on decide comment on va organiser les controller et on peux mettre
ces functions dedans) Je continue pour les afficher dans un fichier jsp
lol
lol2
Use a better way to calculate refname
ok, try to test
update dev status
update dev status with new info
video
bugs
Merge pull request #9 from hmilvu/master

before local share
add cdma support
abstract BasicShape class
Added Property for error messages
Fix bug for group title.
Return an EventEmitter instead of a simple object
Update version and uber-cache dependency
Implement JSON encoding
Merge pull request #1 from mjor/master

Update for uber-cache 0.2.0
Fix upgrade zip file extraction process
improve layout and feedback of share file screen
implement permissions screen
added flags for path
added wp-blocks plugin
finished dropdown menu function and it was a pain in the ass
Merge branch 'master', remote-tracking branch 'origin'
Adding modified licensing information
Basic Authentication Done

Basic Authentication Done if you log in correctly. If you want to view
it on server make sure its set to port 9016. Theres a bunch of changes.
I have not linked the game to the server yet. Will do that tomorrow.
Extract primary-twitter-account
more tests for cycles
Added portfolio page and changed thumbnails
test fix

Fu leon
Merge branch 'master' of https://github.com/silas-h/themaopdracht5
helpers
helpers
Replacing all "makefile" by "Makefile"
typo fix: trERROR_AT_LINE not defined because it's supposed to be trError_at_line

The bug was added with commit 86a4766cec7ddf82d6ca543508ac7d1b1fb8dfd4
on branch compatibility
Use gccmakedep instead of makedepend

makedepend doesn't find stddef.h because it searches in the wrong directories.
The bug seems pretty old but is not properly fixed.
Moreover, gccmakdep is just the same as "GCC -M", so it doesn't need any
other additional library than gcc to be installed to work, which is not
the case of makedepend (part of xutils-dev).
Fix warning at compilation: rc variable was not initialized in integration/wagonFiller.c

The rc variable was used when calling the trError_at_line function,
but was not set befaire by any function exit code.
Minor css fixes
* socket.io
* ask module for socket.io
* node js server and libs
Getting ready for patterns.
Hook into session manager
simbot as podbot know's how to help
Add basic tagging interface
initial import of an empty project skeleton
initial import
update
update
update
updated hoxy submodule
updated submodule
moved fixture into the right place
updated README.md
Merge github.com:sjorek/hoxy-ghost-farm

Conflicts:
	README.md
Updated README.md
updated package.json
updated submodule and tweaked test-fixtures
Site updated at 2012-04-17 04:13:10 UTC
Bracket Highlighter
 MojoLicious
SublimeTODO
Tags
JQuery Snippests
JQuery
Forms: spacing alignment
Python: problem 6
Python: problem 7
fix primality test
Python: problem 8
-mapping view from inversed camera to the borad
Updated classes for JavaDocs
Added Changelog
Merge branch 'master' of github.com:carterpage/JSONassert

Conflicts:
	src/main/java/org/skyscreamer/jsonassert/JSONCompareResult.java
Merge pull request #11 from carterpage/master

Add changelog
Stable keyword for mdev-bb
pimba
Adapt for GHC 7.6
Bump version
fixed default config when first time use, and not saved already
Add extra configuration options
Add tests
Restructure, add some description
NR-193 : Optional autorefresh

done
removed .dep file
some changes to make subclassing make more sense
add some failing tests related to issue #715, thanks to @benlangfeld.
fix #715 and the related failing tests that were added in the previous commit.
add a comment to explain what XmlDocumentFragment::ignoreNamespaceIfNeeded does.
Fix some comments per Andrea.
Added Basic Client to __init__.py
added internal use logic to spydtracker_track_cp()
added search and some improvements
Fixed up item loading checking. (success/fail)
Fixed up the code for problem 14. Was returning the wrong result when using Integers for the recursive function. Fixed it up to use Long variables and it is working now.
add readonly field.
add DetailAdminUtil class for easy use detail view to display field value.
move DetailAdminUtil class to detail.py
1.9.2-p180 needs non-llvm gcc (ref #137)
change production to pg
Add design related files to gitignore
No graphics actually show up, but the pause does happen.
Adding c++11 as default
Added Dates to MainViewController
Previous Commit Fix
added class to error container. led request_content form structure to general form
android notification & background fixes
Change script headers from shell(#!/bin/sh) to bash(#!/bin/bash)

Some minor modification/refactored in work flow for createPatches.sh and runJtregTest.sh 

Detail description on changes in script files  
1.) runJtregTest.sh
	a.) Package names defined in script were not in sync with Makefile package defination. 
	b.) function packageNameExists was not able to access input parameter.
  
2.) createPatches.sh
	a.) added instruction for usage of script.
	b.) checking if the script is placed in currect directory.
	c.)  removed, iterating for loop for geting "<JavaFileName>.java"  and replaced the functionality by use of spliting string into an array and accessing last index for "<JavaFileName>.java".
Added even more tests. Refactored code.
Je kan nu een item aanklikken
article detail pane works
test
version update
use Function() in compile so it doesn't actually run if there's a balanced `}) ... ({` construct, also much faster
added class document uploads
Adding block quote basic styles, fixes #116

Feel free to design something sexier
Merge remote-tracking branch 'goulvench/master' into blockquote
Add some basic blockquote styling
Merge pull request #118 from DirtyF/blockquote

Blockquote basic styling
test
正解不正解判定表示の追加
NavigationBarの追加
storybordfix2
updated cod_support module
more memcpy stuff. for loops are hard.
Unit testing (unfortunately no TDD, since this was an
experiment-driven project)
Unit testing (unfortunately no TDD, since this was an experiment-driven
project)
Added simple GUI
Unit testing (unfortunately no TDD, since this was an experiment-driven
project)
Added simple GUI
Added simple GUI; make table scrollable
Added simple GUI; license and web site notice
WikiaGlobalRegistry: change the classes returned by magical calls

git-svn-id: https://svn.wikia-code.com/wikia/trunk@59577 e846bd91-c042-42a7-a218-4b65e2c1904d
CodeLint: minor PHP lint improvements

git-svn-id: https://svn.wikia-code.com/wikia/trunk@59578 e846bd91-c042-42a7-a218-4b65e2c1904d
Change fb-notesfeed/index.html
Update asdoc
yield文テスト追加
We don't need a 32bit JDK anymore.
use urllib2 instead of httplib
mocha tests startup node server in before() and shut it down in after()
Initial Commit
add a project
代码提交信息
Merge branch 'master' of https://github.com/tangyumeng/hello-world

abcd
Some form examples
Fix #350 additional note about vs2012 having univ. providers in templates
Service detail view improved to show details including the location on the map and image
error checking when deleting unit_size_refs
window.location.protocol
Write out callbacks of the first demo
Trying to fix ckeditor precompilation error
Remove these files, CMake does this for us now
Moving to doc subdirectory
Renaming some files
up to v0.9.3 and refer to terkel/jquery-imagerollover
Created index.py to beautifully skin our results. Copied in the Twitter bootstrap so that Flask may refer to it more easily. Created table.html template to render the data.
List tags on index page
Less stuff in footer, and css followup
Styled logged-in user text and settings modal
- corrected some typo in decoder tests
- encoder functions take in the stream to write bytes to instead of returning seq<byte>
- added unit tests for encoder
addedmore notes
add speed properties to player and lana
Changed light color. Really just want to test out heroku again
Add menu divider.
Remove redundant claro class on body.
Add accordion styling.
add link between app and player
work on suggestion view
Open up perms for all read if saving the output.
XMLRPC: Fix up the new test from [1133] so that it correctly tests the bug.

Previously the test created a post that the test user couldn't edit and so the Post Editing failed.

See #WP22220


git-svn-id: https://unit-tests.svn.wordpress.org/trunk@1137 4a5a2adb-35eb-4268-9a1b-fe04a4134342
ADDED: a new conversation adapter to identify which conversations have new messages.
read me file adding
Add DerivedData to ignore folder list. I don't think this folder needs to be version controlled
add navigation
None
adding config file for installation
offlineimap-multishot: Print current time when sync completes
Changed authentication tables to have auth_ prefix
Change markers based off the currently selected category filter.
Filter markers based off categories.

Allows for a single post to be apart of multiple categories.
Added a second comment to see if Xcode will push it to github
debugged server and proxy
Webkit not building with ComputeContext class and Xcode4.2
Issue #14
Reviewed by NONE.

Adding code fix to make all arguments to ? operator as int.
Using static_cast to convert unsigned int to int.
* Source/WebCore/platform/ComputeContext.cpp

Indenting function defination in
* Source/WebCore/platform/ComputeContext.h
WebCL class cleanup.
Issue #21
Need to clean up WebCL class as per webkit standards.
Will change WebCL.* files along with JSWebCLCustom.cpp and dependent files.

Changes :: * Source/WebCore/Modules/webcl/WebCL.cpp
           * Source/WebCore/Modules/webcl/WebCL.h
           * Source/WebCore/Modules/webcl/WebCL.idl
           * Source/WebCore/Modules/webcl/WebCLDevice.cpp
           * Source/WebCore/Modules/webcl/WebCLKernel.cpp
           * Source/WebCore/bindings/js/JSWebCLCustom.cpp
WebCL:: createContext not taking properties passed.
Issue #22
The createContext API is not utilising the params passed as WebCLProperties Object from JS.
Need to impliment API to take care of the above and use it in Examples when needed.

Changes made to createContext() API to take properties when passed and SimCL.js to use
createContext() with sharedGrp passed as Property.
Changes :: * Examples/WebCL/Nbody/SimCL.js
           * Source/WebCore/Modules/webcl/WebCL.cpp
initial commit
try again
2
added listings
added realtors
added realtors
added realtors to seeds
added haml gem
scaffolded all needed models and controllers
generated resource for listing
working on getting the layout correct
adding upload form
hamld the form
completed for, ready for testing
customized active admin picture upload
uploading images work
customizing views
fixed listing haml
added century21ap yml
fixed application helper
refresh buttons
asdd
Add copyright notices and the text of the GPL.
jffj# Please enter the commit message for your changes. Lines starting
Merge branch 'master' of github.com:traintrackcn/hellorepo

k

Conflicts:
	http.js
more completion paths and emacs key bindings in emacs
jshint config updated
back to web indent
Update to LLVM 3.1

Removed unwind instruction
new library
new library
new library
new library
no need to have jquery here
Added Absentee status to Voter Records for Voter Participation Report
Required ruby_gntp, and removed the command line check for the growlnotify - because growlnotify fails for Growl 1.3x
Work around remove all waypoints bug
Add simplerepr
Add initial CTR infrastructure
Add CTR download for Flytec/Brauniger
Move simplerepr into common
Add crude OpenAir parser
Add CTR upload for Flytec/Brauniger
Add crude OpenAir upload
added the minified css files
sceSas Wrap
Add corresponding wrap templates 
Small fix to _sceSasCore and _sceSasCoreWithMix
Merge pull request #134 from jacky400/master

sceSas Full Wrap 
SDL port: Turn the JIT on and off from command line
Fixed sceIoOpenAsync.
Implemented ADSR (Attack/Decay/Sustain/Release) envelope processing
Merge pull request #137 from Yn5an3/master

Fix to my previous commit
Implemented sceSasSetSL and sceSasSetNoise
Implemented ADSR (Attack/Decay/Sustain/Release) envelope processing 
small fix to sceSasSetSL
Merge remote-tracking branch 'upstream/master'
Small fix to _sceSasCore and _sceSasCoreWithMix
Merge pull request #139 from jacky400/sceSas

Implemented sceSasSetSL and sceSasSetNoise
sceIo: tidy op obsolete comments, switch to one bracing style
Buildfix Jacky's web browser edited commit :P
Small fix to sceSasSetSimpleADSR
Add some missing sce* Functions

Add the missing functions to sceHttp
Create sceOpenPSID and add what jpcsp is doing
Create sceParseHttp.cpp
Create sceParseUri.cpp
Create sceSsl.cpp and add what jpcsp is doing
reindent some files.

in an attempt to try and get a few games doing more.
Add another sceNetStub

sceNetInetSocketAbort this time
Fake scesupPreAcc

Gets Dissidia Final Fantasy to title screen. We will need to make this
one go away by getting PRX loading working properly I think.
Callbacks: Don't trust s0 to retain the call id.

Patapon 2 at least was not during a call, preventing injection.
Hardware doesn't have to deal with injection so not a problem.
Fix running threads in processing callbacks state.

ActionAfterMipsCall was setting it back when it saved it.
Fix scheduling issues with callbacks (mostly.)

 * Don't require as many function calls in the CB() funcs.
 * Always check callbacks when rescheduling (for ones processing
   callbacks.)
 * Run only the current threads' callbacks for successful CB() funcs.
[-] CORE : fixing a PHP notice about $dep_css when there is no dependency
Add admin categries
datatable default rsearch with created at in exam index page
data table in exam index page
datatable with serverside processing in exam index page
add new row of empty exam in exam index page
datatable default rsearch with created at in exam index page
fewf
dddd
put chosen multi select templete
More Python 2 Fixes

In the previous change to support Python 2, I missed that Python 3's `input()` function actually acts like Python 2's `raw_input()` function and therefore needed to be changed.  In addition, changes were made to support sending `unicode`s as well as `str`s as payloads.  Finally, POSTing of multipart payloads was updated to ship both pieces as requests `files`.
Merge branch 'python2'
add twi (atmel appnote)
multi tensor init need updating
Changed tabs to two spaces.
Merge branch 'master' of https://github.com/verma7/IndexedDatabase
Revert "[ADD] New parser for GNU Make and GNU Compiler (gcc)"

This reverts commit d3887fa2520e4921e9de6dae1adfdfe153963c37.
Got the mongoid model working. It needed ruby 1.9.3.
Finalizando pagina Listagem de Intripers
remove facefont
first generic css
Merge branch 'master' of github.com:virtuallight/greenroom

Conflicts:
	greenroom/apps/www/templates/home.html
removed test xvfb instance
added Qt.QueuedConnection param
new create method for activity data
Merge branch 'master' of https://git@github.com/vkcis350/NetterProject.git
Added the basic infrastructure for maintaining and calculating grades
using Class, Category, and Grade objects.
Add src directory to include path
Fix bug where current activity duration wasn't being updated
Change focus policies and tab order
Bundle icons
Version bump
Tweak spacing
Add desktop file and icon to install
Add error indicators for time in activity dialog
Version 0.1.3
Merge branch 'master' into ubuntu
Upstream version bump to 0.1.3
dr字节对齐bug修复
cpe.dr处理align
更新编译设置
更新编译设置
更新编译设置
Merge branch 't/3rdTools/gtest' into refs/top-bases/t/support/dr2
Merge branch 't/3rdTools/yajl' into refs/top-bases/t/support/dr2
Merge branch 't/3rdTools/gtest' into refs/top-bases/t/3rdTools/gmock
Merge branch 't/3rdTools/yaml' into refs/top-bases/t/support/dr2
Merge commit 'refs/top-bases/t/3rdTools/gmock' into t/3rdTools/gmock
Merge branch 't/3rdTools/gmock' into refs/top-bases/t/support/dr2
merge
修改了CCACHE前缀为CPDE_C_COMPILE_PREFIX
Merge commit 'refs/top-bases/t/3rdTools/argtable2' into t/3rdTools/argtable2
add some important info to readme
Added JedisUtil tests.

- Added tests for the JedisUtil utility class. The tests that were added
  mainly checks to see if the connection is always returned to the
  connection-pool (even if an exception occurs).
Finished the pagination functionality, need to add some basic styling
remove urllib2 dep
prefix rights_roles habtm relation table
SUCCESS\!\!\!
MORE SUCCESS!!!
Site updated at 2012-06-02 17:32:51 UTC
Removed the hack from goog.ui.TextArea which set the contained empty textarea's value to ' ' to prevent its height from becoming zero. I didn't manage to reproduce the zero height bug in Firefox, Chrome and Opera. I couldn't test IE.
As a result the CHANGE event isn't swallowed when the textarea is cleared then unfocused.
Fixes issue 503.

R=gboyer
DELTA=11  (0 added, 9 deleted, 2 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5639


git-svn-id: http://closure-library.googlecode.com/svn/trunk@2224 0b95b8e8-c90f-11de-9d4f-f947ee5921c8

Fix return value for Component#removeChildren.

R=chrishenry
DELTA=1  (0 added, 0 deleted, 1 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5640


git-svn-id: http://closure-library.googlecode.com/svn/trunk@2225 0b95b8e8-c90f-11de-9d4f-f947ee5921c8

Properly dispose of created objects in goog.History and goog.module.ModuleManager.

R=dskloet,brenneman
DELTA=7  (4 added, 0 deleted, 3 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5641


git-svn-id: http://closure-library.googlecode.com/svn/trunk@2226 0b95b8e8-c90f-11de-9d4f-f947ee5921c8

Prototype "goog.defineClass" as "goog.labs.classdef.defineClass"

R=chrishenry
DELTA=384  (327 added, 11 deleted, 46 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=5642


git-svn-id: http://closure-library.googlecode.com/svn/trunk@2227 0b95b8e8-c90f-11de-9d4f-f947ee5921c8
Mae crawler output database to TopTenAPI directory
Modify Application title and tile title
Add refresh and restart image
Add a method to get the plugins that are configured to use.
Perfect number checker complete
New citizens rendering component. First dummy algorithm for citizens creation and update. A bare draft for citizen's path from home to work to shop to...
new interation macros, correct sql-identifier, remove tests, add examples
moved Sound class to util-package, updated Creature with a polygon and getPolygon-method
updated GameController
Rebase from 'release/serial' @ version '1.1.1'
Generated debian files for oneiric
Shelving the basic android project.
Site updated at 2012-10-13 10:58:31 UTC
stfuff
the tank and its stats now display in the upgrade page
Support Lua2D IDE
integrate the new ui resource

RT
omit files in last changelist

RT
Added error diagnostics
若干だけ整理した
Change the BI-MONTHLY to BI-WEEKLY.
Merge branch 'master' of ssh://github.com/yuanzhuang/room-booker
now recognizes ace low strait
Updated encoder to use placeholder tags
Site updated at 2012-07-30 20:03:08 UTC
build-with-colors: moar colors

- rename CL_PFX and CL_INS to better match the
  colors they show.
- add more colors.

Output of:
- most host stuff is yellow
- most target stuff is green
- installing/copying files is cyan
- import/export includes and notice files is cyan
- bootimage/recoveryimage is cyan
- and some more colors in many places ;)

Change-Id: I5532afa4ba608e0a7c408516dc9f912f9ca389f7
Merge remote-tracking branch 'cyanogenmod/jellybean' into jellybean
Added NuGet package url and documentation page url
Restructred the project files.
COMMANDS.SH/{cgi-name,nameread,ycat}: fix a bug of misusing AWK.gsub()
add ext list and show commands.

Change-Id: I3bdf1a3b066ee12572468b8d7abee96eb07f9257
Support --no-gateway option

if --no-gateway is specified, null is used for gateway value.
Fixs bug 1035987

Change-Id: I6b9e00563cc2993f40de204e2c399218f00b88c4
Merge "add ext list and show commands."
Use colorbox to display images in overlay.

Conflicts:

	docs/HISTORY.txt
Load ftw.colorboxs zcml in configure.
Added upgrade step installing ftw.colorbox.
Add beanstalk deps
Bump private deps
config_new.py -- testable version of tadokuconfig class.
config tests complete
Added lookup and fixed some stuff
0.12 release notes in Cabal file
building for all
fix undrag bug, clear 'drag' array
get correct getBBox() params if elem is translated
bugfix for RequireJS usage, always stick `eve` into global scope.

Eve support requirejs, but Raphael doesn't; Raphael wants it in
global scope.

A more complete AMD support patch is available at
https://github.com/DmitryBaranovskiy/raphael/pull/540. I didn't use
that because my deployment process currently uses the minified files
and I didn't want to change that too.
updating built files
add field list to mongo queries
Fixed constructor of GameObject
Remove partialViewProducts as it wasn't generic enough to be used for both viewing all products and viewing shoppingCart.ejs
Added logout functionality
Fixed bug with showing the incorrect ordered products (Should've been using TDD probably :P)
fix the pypi page ;)
街头霸王
change before_filter name
map on the side- problem css
Add authentication with Devise
Merge branch 'master' of github.com:AngelCabo/walk_of_faith

Conflicts:
	Gemfile.lock
	db/schema.rb
Gemfile and schema updates
1.remove useless resources 2. add localStorage support
Update _mymiui_apk/Calendar.apk/res/values-de/strings.xml
Merge pull request #2 from linux150/patch-4

Update _mymiui_apk/Calendar.apk/res/values-de/strings.xml
Adding VersionDiff to behavior refs #4090 @2.0h
Filtered OmitSpecimen result from finite sequence.

This provides immediate resolution for a reported issue. However, there
are other places where instances from the context are yielded (e.g.
EnumerableRelay and StableFiniteSequenceRelay), and these must also be
addressed in future commits.
Filtered OmitSpecimen result from stable sequence.

There are other places where instances from the context are yielded (e.g.
EnumerableRelay), and these must also be addressed in future commits.
Filtered OmitSpecimen result from sequence.
Incremented build number to indicate a bug fix

(see previous commits).
Ajout des filter
mise en commun
Presentation change
add small fix for clearing session storage
Fix generation of -DFOO_ROOT=bar arguments for CMake
Disable usage of hwloc on OS X
First read configs, then configure. This will enable per-user settings later
README update
Add LunchBox config
Merge branch 'master' of github.com:Eyescale/CMakeProjects
Fix hwloc config
add Ucotd description
make python configurable in Makefile
A stronger rubber band
Simplify MR_createAndSaveEntityInContext
Amélioration consultation du jeu en cours

Dans la liste des parties, l'ID est affiché pour chaque partie.
Lorsque qu'un joueur continue une partie il peut revenir rapidement dessus en cliquant qur le lien "Continuer partie en cours" dont l'ID correspondant est affiché, si aucune partie n'a été continuée pendant la session alors l'ID est replacé par "Aucun".
Si un joueur tente d'aller sur la page de consultation d'une partie en cours, une notification est inscrite au lieu de la grille de jeu.
LCA for BST & binary tree
I sense a perturbance in the Force
Fixed deadlocks (hopefully)
Added exception of wrong argument handling
CLOUDIFY-1074 Fix build break due to changes made by GS-10651
Merge pull request #10 from itaifrenkel/master

Fix build break due to changes in ElasticMachineProvisioning interface
GS-803 GigaSpaces build version advanced to 6696-986

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@122437 eb64e737-3616-4df0-8941-5ee2ae88103d
CLOUDIFY-1127 rename flags
CLOUDIFY-976
Changed getContainer implementation according to code review by Itai

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@124478 eb64e737-3616-4df0-8941-5ee2ae88103d
GS-803 GigaSpaces build version advanced to 6695-27

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@119521 eb64e737-3616-4df0-8941-5ee2ae88103d
GS-803 Build version advanced to 2493-159
More compact '/' concatnation
Add tools/waf
Fix typo
Add documentation for get_connection_status
Estimate velvet memory based on observed memory use.
small fixed in Azathoth cpp
Merge branch 'release/7.x-0.14+dbc.2' into develop
AJAX call needs to consider path prefixing.
Updated version to 7.x-0.14+dbc.3
Merge branch 'release/7.x-0.14+dbc.3'
fixed gui flaws
got rid of sunspot
Changes to allow rescale to be saved for some parts. Also made call to
setRescale(...) change the button pressed status.
remove Java builder requirement as this is a binary plugin nothing to
build. This solves buckminster building dependency problem.
remove Java builder fromthis binary plugin, nothing need to build
Merge branch '2.7'
Removed extra request for thumbnail urls and added flag to activate this on the server side if server version >= 3.3.0
Bug fix for pre 3.3.0 for thumbnail urls and added test for thumbnail urls. - #10693
Merge branch 'remove_thumbnail_url_request'
Changed import statements for libraries shipped with the shotgun api to use relative import if the python version is 2.5 or greater. fixes #10
Update version and changelog to v3.0.9.beta2 for release
Add new method authenticate_human_user, written by Scott Ballard
Raised default logging level to WARN - #17579
Fixed a typo in the code causing some error messages not to be emitted
correctly.
Added proxy handler to get_attachment
set correct protocol for ProxyHandler from config
Ticket #16279 added proxy handling to upload
Ticket #16279 added auth to proxy handler
Ticket #16279 added auth to proxy handler
improved the error message reported when the server version could not be found.
return thumbnail information when added via create/upload
Merge commit 'e7730abb1751cd8edd690e67a84c15a0c694c88c' into thumbnails
unit tests for new code related to thumbnail uploading on create/update passing
Renaming logos.
Now hiding the tooltip when the inputs are focused.
auto save 2012.10.04
auto save 2012.08.05
fixed pyflake problems
ignore htmlcov
Merge pull request #1 from peterbe/jinja-offline

Jinja offline
FUCK Settings
lost files add to index
lost files add to index
Switch to nokogiri - test result appears to be the same at the moment, except for differences in whitespace.
Extract #nested_list? helper and privatize all our helper methods.
bswap now has gcc extended asm
Makefile Updated
 - ld is no longer directly called; gcc is instead.
 - Debug and Release flags added for gcc.
v5.nasm and v5.jwasm now have use more portable alternative function to set memory permissions.
move all stylesheets & javascripts to external files
matching my installed ruby version
pathconf: dead loop in bionic function __2_symlinks

Fix dead loops in file ./bionic/libc/unistd/pathconf.c

Change-Id: I7a1e6bcd9879c96bacfd376b88a1f899793295c8
Author: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
cascade @Enum
Added template to Atom Link
Add new view to selection location and refactoring Server class
Fixed up the Makefile.
Updated the Version number.
Added a few things to the README.org file.
Added a few lines to the Makefile.
Fix race in JMS Server (which btw, does not play well with fail-back or replication)
Fixed disabling vector unit
Fixed case-sensitivity issue with registering Gravatar class with the Fuel autoloader
Merge pull request #1 from bunchjesse/master

Case-sensitivity Issue
removed lab1 from this branch
mindy trying to sync

revert if this screws something up
separated the header
format extracted data
Mainben hibas zarojelezes javitva.
Some GUI cleanup

Fixed a couple of bugs in the sample GUI and cleaned up the interface a
little (better labels and instructions for the user, etc.)
FontEditDialog
README == Documentation yes?
Delete Selected Messages DoNot Working
remote server v1
git cache, serve is meaty
vault sync deletes old files
Added SpoutMetrics and SpoutMetricsLite

Signed-off-by: Jack Huey <kitskub@gmail.com>
Merge pull request #30 from kitskub/master

Added SpoutMetrics and SpoutMetricsLite
Added MonoDevelop settings
addding src_type support
Image Rotation updated

Clip rect changed to rectangle - may be unneaded
Spritemap working
Added back deleted lines
Merged views
Thread pool scheduler now waits for jobs to complete before assigning new jobs.
Добавлено представление для документа
working get_upgrades_ep, everything is a bit hacky not the best implementation
Revert "working get_upgrades_ep, everything is a bit hacky not the best implementation"

This reverts commit 6f1638feaa37b0d6c677c108874ed25c0ee09447.
urls.py: Remove archivaltool
admin_base: Add random header image, tweak CSS.
added missing file; small modifications
Revert simple skin changes
Set commands
Removes key down command
Regenerated to master@c999c12d0cce946a537a8b1bc914cedae241689c.
Regenerated to master@368d1023d7c194886e3e8008e97c74c31bfe2255.
Regenerated to master@8577fc4a6ad2452815ccc713de2b3f0bd4c66be5.
Regenerated to master@3c4ba0ca6e4d17bf31bec4e7d1757941c2d41b9e.
Regenerated to master@6905dabb193842f48076d48ec50e97d74c75e79c.
initial commit
UI for admin landing page
Improving the messaging system for the admin area
Split admin controller up into a separate controller for each action.
Switch statement in the admin controller routing to the correct controller
Updated admin pages controller. Fixed bug with messaging system
Finished updating the admin sub controllers
Added subheading to admin header
Added menu to public area and submenus for categories
Merge branch 'master' of github.com:JamesGarethSmith/themes
Added code var to check whether code has changed onkeyup
Merge with imtech_commerce_mods
Finished intro to discourse 1.
Dokumentation

Lite uppdateringar av både kraven och risklistan har nu kunnat
uppdaterats. Detta är nu klart och sparat som .pdf
Added Ajax submit show
I forgot to remove the parens of length also in the log string. Yep, I'm idiot!
Information about find precision
Updating HTML
Encryptor additional exercises
Added bottom margin on the exercise section
Encryptor

Instead of using the addition and worrying about UTF-8 formatting
problems I have written in some instruction that uses ranges,
array.rotate, array.zip, and Hash[].
Merge branch 'encryptor'
Added documenation for return structures, credits added, probes added, reference added, traceroute added, servertime added
Finished third world
Dit is Moblet test commit
Merge pull request #106 from Lascar-Usuel/stats_page

Stats page: Average by promo
PPG autobrightness
Added the OAuth token
Create subdirectories.
Create subdirectories.
turn around if parameters
Merge pull request #39 from nicokaiser/readystate

turn around if parameters
Update to email address
Merge branch 'master' of github.com:Legrandin/PyAuthenNTLM2 into urlparse_replacement
problème trouvé

il faut changer le type de variable

Signed-off-by: Ladislas <ladislas@leka-smarttoys.com>
Added ImmutableMap
Tests and Maven
Added The PHP script to Save the Annotations
Tumblr Number correction
Amended copyright info
A script to creat links was added.
bashrc was updated for COOL VM
Adicionado url para ver dados do RADAR.
Adicionado view para mostrar dados do Radar."
Alterado Radar, adiciodo evento de click para mostrar Incidentes.
Alterado para mostrar Dados do Radar.
/mode now places the block

Physics may not actually work on the block yet
Implementing search functionality.
Still implementing search.
Re-implementing fetchDummyTasks
Array fix
Fixing task hiding.
Fixing hideing
Debug --> console
Testing this stuff
Testing taskHider.
Fixing typo.
Fixing array foreach.
Implementing search.
Fixing typo.
Added search field.
Fixing searchfield
Show tasks when clearing the search
Fixing adding of new task.
Added minimum length for search.
Implemented keyword generation.
Fixing keyword implemention
Remove LogFilter
FOlder support clean commit
back button test
Merge pull request #10 from ManuelOlvera/androidBackButton

back button test
Removed complication on UseRabbitMq(), now it's just one method.
Fixed Ionic Bonding
nu virker customer fuldt ud i ny booking
added cropping function to main window
Merge branch 'master' of https://github.com/MattRichard/photo-album
Hand minified Tiny.lua to 245 bytes.
Ported autoscrolling tabs from SIII JobManager.apk
Remove ruby 1.8 from the travis configuration and add setup for the test db to the configuration.
Updated changelog - fixed dynamic document issue
need to count occourences of vars too
Update events
RB 1.56
Merge pull request #148 from Monstercraft/Dev

Dev
Add a conga tumbao.
Go from D to Bm to E.

Correctly compliments the melody.
Add a sweet guitar part.
Removed resolution from theme chooser (since it's irrelevant to the enduser) and updated description
Merge branch 'master' into fixes/0.26
Merge changes from master and bump version
Updated to RavenDB v980
A change was made
Added some more things.
documentando el README
Edit function to return roman number 90 to 99
Add more test case number 100
fix for readme validator
Fix Python client to work with file specs

Add class FilePath and FileContents to support input file
spec.

Change-Id: I87f030a47ac395ff41e8823569c8ab2668745afa
Merge topic 'python-fixes-for-file-spec' into master

24cbacb3 Fix Python client to work with file specs
ENH: faceSource: add area-normal integration or averaging
fixed two incorrect values in SettingsController
Fixing dependency on world model library.
Fixing regex matching for current snapshots.
fixed major parts of the leaderboard
Merge branch 'master' of https://github.com/PeterNachbaur/surfstats
Still building fundamental stuff.
2012-20-04 commit 3
Rename the match search functors

Strip the "outer" part, as the result is a complete match search.

Rename "simple pattern" match search to "greedy", which is hopefully
more descriptive.
Re-organise tests for the new matching code
Better "done" strings when testing concrete matching
Fix concrete tests

The wrong thing was being tested, due to modifying the wrong variable.
Clean up unused variables in concrete matching tests
Reorganise matching tests, and start greedy matching tests
db y diagrama
removed hardcoded locales
EmailTemplateTranslationProxyProxy
added fromName and fromEmail fields on templates
allow to send a preview email
Merge pull request #5 from Remixjobs/arnaud/preview

allow to send a preview email
Site updated at 2012-03-31 15:30:55 UTC
3.5-rc7-imx2 release

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Moved the project folder to the root directory.
Ik had per ongeluk ergens pointers neer gezet. Snel even verwijderd ;)
Scenario afgemaakt en werkend gekregen. Een test is te vinden in Verkeersplein.c
Refactor getEnergyRequiredToReach
Добавление пространств имён\категорий для логов, что бы можно было разделить и посмотреть вывод каждого по отдельности
I can haz style?
added README.md

Signed-off-by: Fábio Dias <fabio.a.s.dias@gmail.com>
Fixed ABI & Generic A500 / A501
Deleted space between robot windows and scren edge
Removed the /TG/ "feature" which has explosions insta-gib dead people.  THIS IS WHY I HATE THE MERGE.
Merge pull request #1898 from SniperYeti/master

Security Belt Modifications (Added the stuff I missed)
first test of running the concatenated source through a compiler
Uses an approach to nest divs for each sheet.
Seperated functions into classes.
0.6 Essex alpha version
0.6 Essex alpha version
0.6 Essex alpha version
0.6 Essex alpha version
0.6 Essex alpha version
0.6 Essex alpha version
0.6 Essex alpha version
0.6 Essex alpha version
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into precise-pkg
[STACKOPSDISTRO-92] updated glance to essex version
Added support for activity log dump
Added portal users and roles in keystone
Modified services in keystone and apache to access them through publicUrl
Added portal users and roles in keystone
Modified services in keystone and apache to access them through publicUrl
Added portal installation layer
Re-enabled collectd
 (STACKOPSDISTRO-84) Create /root/.ssh folder by default
 Fixed vnc proxy default IP
  (STACKOPSDISTRO-35) Add the flag --notification_driver=nova.notifier.rabbit_notifier to configuration files
Collectd cleanup
Fixed bonding issues on boot
Using flat_interface instead of override_bridge_interface
Fixed shared storage
Enable listener in libvirt-bin for live migration
Changed disparity mapping challenges text.
Added comment to help keep a record of why inner evaluation is skipped
Merge branch '387-recursive-computed-eval'
public API extension

+ added onOpen()
+ added onClose()
+ more readme
Deleted nonexistant file
Update Accelerometer axis for Pigeons Attack sample
Add specification for CartProvider, clean it up a bit
Add specification for cart operator
Simplify the removal of cart item, modify the ItemResolverInterface
jQuery mobile added
Merge branch 'CachedContent' of git@github.com:TakashiSasaki/odenkiapi.git into jquery-mobile
CachedContent handles If-Modified-Since field.
odenki Javascript API
JSON-RPC related functions were handled in lib/JsonRpc.py
/index consists of html/index.html and js/index.js
Cache-Control with max-age
Merge branch 'reducing-number-of-template-files' of git@github.com:TakashiSasaki/odenkiapi.git into If-Modified-Since

Conflicts:
	lib/__init__.py
merged
Merge branch 'remotes/github/master'
Merge branch 'If-Modified-Since'
/api/Echo was implemented.
supports non JSON-RPC
reducing to use django template.
MyRequestHandler was replaced with html/ApiTest.html
dynamic replacement of SCRIPT tag.
element replacement utility function on odenki.js
setVersion was replaced by fillVersion.
/api/SessonInfo returns session id
JsonRpc becomes more robust.
fillText supports A element and multiple elements.
Bigger headpose & head gaze meters.
[#7] Rouan : Book controller inherits BaseController
[#7] Rouan : Added all book properties
add operate area choose
Update to match with tiddlyweb 1.3.0

use of httpexceptor
changes to tiddlyweb.web.listentities:list_entities
some commit
test commit
bug branch
change default font size
add ignore files
Added additional settings when initialising the game
First intial project upload

Signed-off-by: Tricon2_Elf <tricon2elf@hotmail.com>
Core/Spells: Fixes the rune cooldown when a hit mises the target
Closes #412

Signed-off-by: Subv <s.v.h21@hotmail.com>
Core/Opcodes: Remove duplicate opcode CMSG_QUERY_COMPLETION_NPC_RESPONSE
Core/Entities: Updated rage to Cataclysm
Core/SAI: Added new parameter to actions 90 and 91

Allows to set and remove all possible bytes1 based on `type` parameter
You can see them listed in Unit.h for reference
Merge pull request #7134 from acrathos/master

SmartScripts: added new parameter to actions 90 & 91
Scripts/HallsOfOrigination: Added script for Earthrager Ptah.
ToDo: Fix spell Sand Vortex on Heroic difficulty.
Note: Feedback needed.
multiple minor, eager load categories on search page
Merge branch 'master' of github.com:TrueOrFalse/TrueOrFalse
Removing the autogenerated file gen/what/gui/R.java
Changed tnt to support BlockDetonateEvent
setup package.json
setup UI, server and socket events
add arduino code
Fixing some mistakes in the appearance of /level (#3)
Fixing reset of points on reload, login and anything else
Finising /level, closes #3
Switching to German as message language (should be configurable later)
background css property value tests.
Jonathon fixed the timer. I cleaned up the code in MainMenuViewController.
fourmi news
Merge pull request #2 from Thielemansanthony1c2/master

petit sur les fourmis zombie
titre
Merge pull request #3 from PoireThibaultSRC1C2/master

yo
nouveau
Merge branch 'master' of https://github.com/LethoDuclosHadrienC2/TP2
Merge pull request #4 from HuddlestoneMelanieSRC1C2/master

nouveau
titre
Merge pull request #5 from PoireThibaultSRC1C2/master

salut le con 
modif
Merge branch 'master' of https://github.com/LethoDuclosHadrienC2/TP2
Clean-up data sync services.
Add Toast message for starring/unstarring items.
Move data URLs to call into the sync services.
Add background service calls to update favorites.
Be somewhat less unaimed in putting the image tool in the tarball.
Add header for std::sort.
Add files missing from 1e5fafabb39f76762ab7a560be7770595bc60a8c.

Fixes ticket:3646.
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Add files missing from 1e5fafabb39f76762ab7a560be7770595bc60a8c.
  Add header for std::sort.
semperfi-js: Fix looking for oil bug
qtscript: Change eventGroupEmpty(group id) event into eventGroupLoss(object, group id, new size).
Remove qtscript test from 'make check' for now. Closes ticket:3500.
プログラムコードを本文に記述している箇所を修飾
Organizer の説明を追加
Updated Skin to latest MPD++ Version (Backdrop)
Initial commit of the Jekyll gist tag for github
maj ,contact
Amélioration affichage mobile + Fix bug formulaire
Change main logo image
Rudimentary time implementation
Fixed some idiotic bugs with MutantMod.
debugage mais finalement le problème "Une erreur technique a empêché l'enregistrement correct du champ champs " étatit provoque par innob, changé par My Isam dans la table aspip_articles
Added mysql2, ruby
- Fixed up puppet linting errors.
- Fixed up params file.
- Added httpd::config for sample tomcat app from http://tomcat.apache.org/tomcat-5.5-doc/appdev/sample/ .
- Fixed up puppet linting errors.
- Fixed up params file.
- Added httpd::config for sample tomcat app from http://tomcat.apache.org/tomcat-5.5-doc/appdev/sample/ .
init with id
add gluten-free and heat-index icons to each food item in loop. SCSS cleaning/ refactoring
Updated to current buildtools version

--HG--
extra : rebase_source : d7a0b46aa4284cd2c058c43d974591df468f1645
Backout out revision 8ce1cfb4d7f6 (the original change was correct)

--HG--
extra : rebase_source : ccbe9fb2a3e65a3896ff428c991f611c3cc8d5c9
fix font error in error page.
'testexperiment' dir no longer of any use
Added links, fixed readme
Merge pull request #1 from bchew/master

Updated readme with links, fixed spelling
Fix extent for solid

git-svn-id: http://nekonme.googlecode.com/svn/trunk@1902 1509560c-5e2a-0410-865c-31c25e1cfdef
Fix extent for solid

git-svn-id: http://nekonme.googlecode.com/svn/trunk@1903 1509560c-5e2a-0410-865c-31c25e1cfdef
Use opengl line scaling when not 'normal'.  Add 'OpenGL' line scaling mode.  Use Joshuas Line01 code on all targets

git-svn-id: http://nekonme.googlecode.com/svn/trunk@1904 1509560c-5e2a-0410-865c-31c25e1cfdef
Add <app min-swf-version="" /> property. Instead of overwriting the current SWF version, it will only increase when necessary. This should be useful for libraries that require a minimum version, like Flash 11, but do not want to prevent the user from requiring a higher version

git-svn-id: http://nekonme.googlecode.com/svn/trunk@1905 1509560c-5e2a-0410-865c-31c25e1cfdef
Use mock_model instead of plain mock.

Signed-off-by: Matt Wagner <matt.wagner@redhat.com>
Projectile StyleCop
add admin parameter, add module parameter, set type of module parameter
Search Page Created
remove sign_up from routes
The Citrus Engine meets Away3D
Shuffling can be done only for one user at a time.
Added Random to confMethods.
Use jshint (vs. jslint).
Remove JSLint folder.
Retirada da <div id="documento"> desnecessária
Retirando a tag <div id="conteudo"> que nao era necessaria.
Retirada de uma tag div class bl-conteudo que estava sobrando.
Revertendo uma das tags div class bl-conteudo tiradas.
Refatorando o arquivo CSS.
Merge pull request #10 from alex-shpilkin/master

Checks for cc-lib
Removed plural extension from NSNumber in favor of https://github.com/mattt/TTTLocalizedPluralString
Let user specify location globs for location-aware prompting
QtRadio: Makefile.am added -lQtWidgets
Even more UI stubbing.
JSON over xmlrpc for Bootstraps
提交
Revert "初次提交代码"

This reverts commit 303d814845c611a79d7adeabde98d5a7973621aa.
removed all logo stuff so there is no business link branding
Remove dismissal of beta popup from tests.

The popup is no more...
Fix interface connexion and resync
correct missing comma
HOTFIX: took out editing DNS_device_assocs ip_relations -> All additions of device_assocs should be done on the IP side
Added contextmenu in full size node tree
fixed settings javascript
Novas tabelas de relacionamento e suas respectivas chaves estrangeiras!
tim can now stop time. laid the ground for reversing time as well
changed the readme file, now is more clear
Merge branch 'release/v0.17.1' into develop
Update ci-travis config
Add build status images to readme
Add changes for v0.17.2
Bump version number to 0.17.2
Merge branch 'release/v0.17.2'
Display street address as location instead of city name
Refactoring & cleanup
Game over state will allow going to title screen by touching
Added missing License information for a few classes.
added ability to provide the from name on outgoing messages
Changed the date of the README
PreferTryParseRule.cs : fixed null-reference exception that happens when Resolve() method cannot find a library with base type and returns null
PreferUriOverStringRule.cs : fixed index-out-of-range exception that happens for three-letter method names (test is included)
AvoidDeepInheritanceTreeRule.cs : fixed null-reference exception that happens when Resolve() method cannot find a library with base type and returns null
AvoidDeepNamespaceHierarchyRule: Added overload of "Solution" property that is required when MaxDepth property has value different than 4
DisableDebuggingCodeRule & GetLastErrorMustBeCalledRightAfterPInvokeRule: fixed NullReferenceException-s (discovered during SharpSVN analyze)
Update to the master api
[monodoc] Suppress output from grep in conditional

This prevents a strange (albeit harmless) warning when, for example,
/etc/gre.d/ does not exist.
One-time change
Bring back to life
Merged wrong line
Ignore empty env variable
Add csproj file
Fix property comparison when only setter exists
[windoc] Initial commit
Big-O-Commit
[windoc] Don't load an URL if we are already on it
[windoc] Don't try to sync up tree when we had no match node
[windoc] We live in a winDocPath now
[windoc] Parse cmd line to fetch initial url to launch and extra doc sources
[windoc] Copy monodoc.dll to builddir
[windoc] Use a not strong named monodoc.dll
[windoc] Redirect console output to a log file
[windoc] Correctly handle URL with '/*' in them
dev for base schema migration
Merge branch 'development' of github.com:aowie1/rocketag_laravel into development
[#4961] WIP
- setup mysql-extract to process foreign-keys
- added attribute to MySQL2Mongo class to store raw inputted SQL command
- setup query to MySQL for foreign keys and loop for processing results
- Foreign Key relationships now extracted from MySQL and stored in collection metadata
finished initial api
Started on Trial of Champions...
Exercise ok.
currify
uncurrify
map
Adding newline at the end of every generated line. Focus/Blur event handlers for input.
course assign css
changed wait state to R13 signals
add friend now working
only allow upload on signup
mobile and font-display updates
updates to TEachings
improved Twitter
tweak auth page
Fix implementation
Release 0.1.0
Corrected sauce case
added simple fonts
added stereo support