labofsahil/github-event-dataset-2012 huggingface dataset:
rather than building a ChildProcess from a concatenated string, use the array format instead (to avoid jruby shell escaping, for one)
childprocess under jruby doesn't like killing a process it didn't create -- instead, use ruby's Process.kill to kill arbitrary PIDs
issue #6: support different jetty configuration, by loading the jetty.yml config wrt the current environment (or falling back on the jettywrapper default config)
Merge pull request #7 from cbeer/feature-envconfig

issue #6: support different jetty configuration
Merge pull request #4 from cbeer/fix-jruby

Fix jruby
Bumped version
use startup_wait on Jettywrapper.instance.start too, and refactor sleep logic into a new method
Poll the jetty port for a response to determine when jetty is ready and
listening for connections. Timeout after `startup_wait` seconds and
continue on.
Merge pull request #5 from cbeer/feature-startupwait

Listen to the jetty log to figure out when it is ready and listening
remove unused dependency
Update README.textile
Update README.textile
Update README.textile
Update README.textile
Update README.textile
Removing references to hydra
Fixed the restart task
Adding ability to pass configuration options to jetty itself for full flexibiliry as specified in http://wiki.eclipse.org/Jetty/Reference/jetty.xml_usage.
remove duplicate line declaring attr_accessor :port
Merge branch 'master' of https://github.com/rnz0/jettywrapper into rnz0-master
Fix blatant error.
Added one example: solve heat equation in a circle.

The example gives me a core dump if ran from "ipython --gui=wx".
But, it works fine if I start IPython without any options or using
the qt backend. Also fine from the command line "python ex_heat_circle.py".
Another 30% faster, so the whole ex_heat_hemisphere is 2x faster now.

Achieved doing  len(interpStencil) * len(xbaseptIndex) additions in one numpy
pass instead of in len(interpStencil) passes.

In ex_heat_hemisphere, with len(interpStencil) = 64 & len(xbaseptIndex) = 3:
[#] timeit xbaseptIndex + interpStencil
100000 loops, best of 3: 4.87 us per loop
[#] timeit [xbaseptIndex + interpStencil[i] for i in xrange(len(interpStencil))]
10000 loops, best of 3: 141 us per loop

35x faster adding everything in one go!
Remove unneeded dependencies from PhantomJS runner
Update travis build to use unified build through ./go
A sample application which retrieves "https://www.twitter.com".

When built on OSX 10.5.8 (32-bit), it succeeds.
When built on OSX 10.7 as a universal (32 and 64-bit Intel) binary,
it succeeds on 10.7 and fails on 10.5.8 with "root CA certificate
untrusted for this purpose".

ref: http://stackoverflow.com/questions/13093025/qt-on-osx-10-5-8-the-
Adding Twitter root cert.
work late test #1
new style

grafica nuova, corretto errori nelle tabelle.
big update!!! usa il db nuovo
Updated DBConnection tests to include new test cases to improve coverage
disallow "default" init parameters for #484
make sequenced args in named args lists arguments to params of type
Iterable fix #465
shadows, shadows, shadows
edit shadows
removed old data
set fixed value for shadows
Added shadow shader
Ajout de la licence
Ajout du gitignore
initial commit
Merge branch 'master' of https://github.com/chaiyawut/easycare
Revert "probando iconos"

This reverts commit 00277db7a8fa5277a0169b86dce4498917d6898a.
Revert "Revert "probando iconos""

This reverts commit 141e88bcbab653ba741d2ab27f16b6943e6412a1.
Revert "probando iconos"

This reverts commit 00277db7a8fa5277a0169b86dce4498917d6898a.
add IIP CLI docs
Paddles complete
* Don't crash on startup when database not ready
 * experimental lightweight duplicate detection
 * experimental local directory scan
 * update readme
Fixed iframe format.
Changed so that the ChangeSet throws when a change is not found.
committed for Chris
Merge branch 'dev-connectn-feature-iddfs' of github.com:chriscasola/cs4341 into dev-connectn-feature-iddfs
Updated Column, fixed testColumn
Updated Board.
Merge branch 'dev-connectn-feature-JournaledBoard' into dev-connectn
Adding clean alias.
Merge pull request #5 from chrisrobak/master

starting python input
Making databases more relative, adding local jQuery
Merge pull request #6 from politeauthority/master

Updating Models
making more global view loading capabilities for all controllers and new apps dir
Merge pull request #7 from politeauthority/master

Simplifying view loading, beginning apps
Fixes for outside controller, updates for Apps, and navigation
Merge pull request #8 from politeauthority/master

Fixes for outside controller, updates for Apps, and navigation
Merge pull request #9 from chrisrobak/master

adding wunderground python start
fixing module base for wunderground
Maps 60 to 64.
Leader system and update ticks.
Update
Сделана панель выбора героя

Текущий герой находится в
GameControl::getGameControl().getCurrentPlayer()->getHero()
Добавлен прототип покупки
Merge pull request #351 from jfox015/develop Added globals flag to Assets to conditonally turn off global includes
Fixing issue with TIMESTAMP fields in the migration file
Fixed function parse_views in template.php library (was a self-calling function)
Merge pull request #354 from antoniofrignani/develop

Fixed function parse_views in template.php library 
breadcrumb i18n: from home to lang('bf_home_page') and from strtolower to mb_strtolower
Merge pull request #360 from jmalinens/develop

breadcrumb i18n improvements
Fixing Database backups as per Issue #362
Fixing "name" attribute of select button per Issue #362 (silentcoast)
Cleaned up Application Helpers

I added @phpdoc blocks for all helpers and enclosed each helper/function definition inside a function_exists call as per CI docs.
Merge pull request #366 from AnthonySterling/helper-tidy

Cleaned up Application Helpers and added phpdocs
Merge pull request #324 from honarkhah/patch-1

Update install/language/persian/install_lang.php
Updating the message about the version
Bumping version number and adding changelog entries
Fixing the version number
Added correct classes to form inputs
modulebuilder: remove the xss_clean option

xss_clean is removed from the list of validation options in
modulebuilder.

As mentioned previouslly, it has very limited scope, and since it
doesn't actually work we should not be endorsing it.

(I haven't stopped modulebuilder using xss_clean internally though ;).
Merge branch 'xss_clean' into develop
Revert "come on ie"

This reverts commit 1530fe89dfad56c0c12da7a4b68ec52386e66e5e.
fixed display of quantity and ingredient on recipe show page
Tweak README wording.
Add Python 3.3 support to documentation (but not to the Tox configuration).
Send all logger messages to stderr.
Instrument atom and red.
update jmobile theme
Update index page for JobSeeker
move eqfd stuff next to other fd stuff
* src/main/clojure/clojure/core/logic.clj: fix typo in tests, fix exclude-from-dom, y* will be a set in -distinctfdc, list-sorted? impl
* src/test/clojure/clojure/core/logic/tests.clj: list sorted tests, test todos
* src/main/clojure/clojure/core/logic.clj: fix -distinctfdc body
* src/test/clojure/clojure/core/logic/tests.clj: exclude-from-dom test
When saving a group with a filename as name, the extension is now automatically removed (to avoid inconsistent naming relatively to selected output type)
Fixed several cases where user could delete the only element in a variable list on a command.
Command drop downs no longer select the first value as default if no data exists in the function or template xml.
Transfer command hidden.  Task Run Log ajax now synchronous.
'Dataset' renamed 'SetEcosystemRegistry' in the code.  Popup key picker removed from command.  Update sql set accordingly.
prescience regarding hackage upload
[s1838] Add support to pause Waypoint Movement

Also add new SCRIPT_COMMAND_PAUSE_WAYPOINTS to do so.

Notes:
- Pausing waypoint movement will not stop the movement in between two waypoints
- When a waypoint is reached while in paused state, scripts of the reached waypoint are not executed until the movement is unpaused
- Be sure to have waittime > 0 when you intend to pause waypoint movement as a result of the db-script on reaching a waypoint

(based on commit [12299] - ebaf984)
made hello2 scene
Factored out code into ieee module.
version update after auto-build
Import 2.6.0 tarball.
Merge branch 'upstream'

Conflicts:
	build/win32/vs10/atk.props
Update version information.
Merge remote-tracking branch 'origin/CoApp'

Conflicts:
	COPKG/version.inc
setup: bump to 0.4.8
Documentation Update : BST Insert
Added basic version of tabfiltering
Crash in service.c (tvhlog) due to s_dvb_mux_instance not initialized when source is IPTV
Morgues are both sites as well as PEs
Merge branch 'master' of git://github.com/flavour/eden
Bug fix
bug fixes
Merge branch 'master' of git://github.com/coldblooded01/eden
Merge branch 'master' of git://github.com/flavour/eden
Allow .iframe format for report method.
Remove "mean" method
Fix #1149
Full-screen map doesn't flash menus, start enabling polygons for feature layers
Crisis Demo
Security Management module
test system
Merge branch 'work'
CSPACE-5109: Add key/value pairs to message bundle to prevent 'string...missing' errors
Merge remote-tracking branch 'upstream/master' into CSPACE-5109
Merge branch 'master' into CSPACE-5109
Merge branch 'CSPACE-5109'

* CSPACE-5109:
  CSPACE-5109: Add key/value pairs to message bundle to prevent 'string...missing' errors
CSPACE-5109: Removing comments from production message bundle.
add the runing update
updating the info class and assocition file
update readme
remove files
Refactored AddStats() to use generic Visit() helper.
Update lib/internet.js

Few more username options
Add full list of function names and "override" keyword to makefile.nanorc
background painter for chrome disabled and bookmarking enabled
Before moving forward
linked Image model to Dealership model; changed front-end to display images on homepage; changed Image admin
Fixing classpath AGAIN
Moved the Add Tags field to the right side of EditPictureActivity
Link con postEngine/post.php
Use slice instead of substring.
Update teststack configuration to enable Opera.
cleanup

Signed-off-by: Sven Strickroth <email@cs-ware.de>
added divider

Signed-off-by: Sven Strickroth <email@cs-ware.de>
-Can now add origins to network arrays via drag'n'drop
-Origins/terminations now handled correctly by script generator.
Merge branch 'master' of github.com:ctn-waterloo/nengo

Conflicts:
	simulator-ui/python/template.py
Removed some unused imports
Revert "Removed some unused imports"

This reverts commit a259a90eea25844aade5f6153423dca6c41fd813.
Removed unnecessary import
splitted SessionState to ConnectionState & TrapState, renaming
new file:   src/java/hdfs/org/apache/hadoop/hdfs/filecache/LRUCacheManager.java
	new file:   src/java/mapred/org/apache/hadoop/mapred/LocalityAwareHash.java
	new file:   test/TestLog4j.java
modified:   src/java/mapred/org/apache/hadoop/map2/MapTaskPacker.java
	modified:   test/FakeDistributedSystem.java
	modified:   test/FakeJob.java
	new file:   test/TestScheduler.java
Site updated at 2012-05-18 15:13:31 UTC
Comment out POI buzzer option, since it currently doesn't do anything
Add comment to explain the last commit
major changes:
Add module to lab functional but not complete.
Run lab only major function not working.
Still unsure about how to implement 'progress bar'
CloudSuite, add delete module are done
tagging as v0.3.1
- 0.3.2 read module options

- 0.4.0 User login

- 0.4.1 User levels

- 0.5.0 connect to EC2

- 0.5.1 run algos

- 1.rc1 wooo
Octopress init
Site updated at 2012-07-24 18:55:52 UTC
8.2.4
user signup complete
TST fixups to MPI unit-testing
now actually waiting for the image before switching photo
forgot to add History.js to browse grid, fixed
liboptimizexx V0.1.2 for github
Merge branch 'master' of github.com:damb/liboptimizexx
Fix some things; still not working.
Merge branch 'master' of github.com:damiansra/empyclaw

* 'master' of github.com:damiansra/empyclaw:
  third commit
  remove rp1_transient_em_fwave.f90, now is saved as .old
  second comit

Conflicts:
	em1D.py
	rp1_transient_em_fwave.f90.old
Remove log and so files.
Remove .old file.
Added extension methods for HttpClient
add eventmachine test code
Alterações de configuração para os testes
throw __restrict__ in where appropriate in throughput measurements
1. do clear on rule's compressing and extract
2. do compress function upvalues in plugin params' storage.

Signed-off-by: Daogang Tang <daogangtang@gmail.com>
Allow to override default CSS with a custom style in an external file.
content views - support refresh as 'async' in UI (includes backend chgs)

This commit contains changes so that the 'refresh' operation can be performed
as an async operation.  This includes backend changes so that the refresh
is executed by delayed jobs and a task_status is created for the new
'version' of the view created.

Updated the UI to monitor the task that is created, updating it upon
failure/completion.
content views - shorten length of couple of lines
Content views: refreshing views from the CLI
Content views: api refresh test
Content views: fixing tests due to == returning false

Fixing tests where the models were the same but the objects did not match up.
Using id instead.
Merge pull request #1254 from daviddavis/cv_refresh

Content views: refreshing from CLI
Merge pull request #1263 from bbuckingham/fork_content_views

content views - support refresh as 'async' in UI (includes backend chgs)
Ignore rope project files
Merge pull request #1269 from daviddavis/cv_test_fixed

Content views: fixed some tests
Content views: handling new refresh code from CLI/API
Content views: fixed broken refresh tests
Merge pull request #1317 from daviddavis/cv_cli_ref

Content views: refresh from cli update
content views - UI - views, handle case where there is no task
content views - support publish as 'async' in UI (includes backend chgs)

This commit contains changes so that the 'publish' operation can be performed
as an async operation.  This includes backend changes so that the publish
is executed by delayed jobs and a task_status is created for the new
'version' of the view created.

Updated the UI to monitor the task that is created, updating it upon
failure/completion.

If an error occurs, a 'retry' link is rendered; however, additional changes
will be added in separate commits to allow user to retry the publish.
content view - refactor out retrieving the task_status associated w/ publish
content views - fix test failure after async publish chgs
Merge pull request #1318 from bbuckingham/fork_content_views

content views - ui/backend - add support for async publish
content views - ui - add the skeleton to support views, content, filter panes

This includes the routes, navigation, template views and controller
actions.
content views - ui - initial code for the view definition -> content pane

This commit contains the initial code for the Content pane for
a Content View Definition.  It allows the user to select the
products and repositories that will be used when creating filters
and publishing to a view.

The UI used is based upon the logic used for the existing Package Filters
page.  The logic from product_repo_selector.js is entirely
copy/reuse.  As the code for content views is written this
code will be refactored and slimmed down to only that which is
necessary.  Note: the filters logic is being removed; therefore,
the duplication of code is only temporary.
content views - minor cleanup
Merge pull request #1143 from bbuckingham/fork_content_views-2

content views - ui - skeleton code for definition and initial content code
content views - ui - initial code for the view definition -> Views pane

This commit contains initial code for the Views pane for a
Content View Definition.  It allows the user to publish
the view and see the list of previously published views
off of this definition.

Note:
- there is currently an issue where user cannot publish the definition
multiple times; however, that is not related changes in this commit.
Merge pull request #1158 from bbuckingham/fork_content_views

content views - ui - initial code for the view definition -> Views pane
Encrypting admin password
Added current_user highlight in scores. Added rank to user page and rake task for cron to update it.
Tweaked the rank stuff
Merge branch 'master' into develop
Remove some dup from code_executor.rb
Merge pull request #88 from vredniy/develop

Remove some dup from code_executor.rb
Update libraries and code for the latest refheap changes (to www.refheap.com).
Don't try to find non-existent error message.
Merge pull request #96 from Raynes/develop

Fix refheap pastings
Merge branch 'master' into develop

Conflicts:
	Gemfile.lock
Fixed exception on solutions/share

Fixed exception GoogleBot was causing when it hit
solutions/share with no params[:solution] set. #94
Merge branch 'master' into develop
shelling out classes
cleaning
Completed the subcriptions list on the backoffice
Added the sort to the admin bean
Merge branch 'master' of https://github.com/davidpcruz/MSE-EAI.git
Added superclass to map the comapny
saving recent hello2app, epsite
Remove useless, broken supports_change_timezone conditionals.

I guess when we initially did the timezone support, we thought it might be
connected to the auth backend. The result of this was code that would hide the
field on the preferences dialog for all auth backends except the standard
builtin one, and then fail to save when users tried to change their preferences
because the field was still marked as required.

Because the timezone setting is just part of the user profile and unrelated to
the auth backend, there's no reason to have these conditionals present.

Fixes bug 2797.
Reviewed at http://reviews.reviewboard.org/r/3491/
Close fullsize image using escape key or q
first commit
merge
Merge branch 'master' of github.com:dbockenfeld/IITUBF
New file
fixed pantry item info positioning on mobile sizes
Some fixes for delays and safely eiting
Renaming git repo info
changing the database configuration file
add vim as default editor
wip stats for track
rename fakeweb support + fakeweb monkeypatch
Merge branch 'rails32_portability'
minor changes (e.g. lines at end of files) to reduce diff between upstream)
Adds abstract class that repesents the API which is needed for
 UI.
debugging bndcontainer initializer
Pathing adjustments to use BND's workspace to find projects.

Probably need to understand what the exact reason is for using
eclipse pathing in all of these locations. Perhaps I'm missing
something important and shouldn't be making these sorts of
changes.
테스트 프로젝트 제거.
dotfiles_old renamed to old_dotfiles
Optimizado el algoritmo de búsqueda
modificaciones varias
renamed goals to workflow in KBPrototype
客户端模板初步编写
Merge branch 'master' of github.com:devilTian/Fragment
querytypo
Turha rivi pois.
Ostohinta ja -alennukset tuotekyselyssä.

Osataan hakea paremmin ostohinta ja -alennukset. Nyt otsikko ja alennukset tulevat dynaamisesti yhtiön parametreistä riippuen.
Merge pull request #302 from devlab-oy/sami/ostoalennukset_tuotekyselyssa

Ostohinta ja -alennukset tuotekyselyssä.
Merge branch 'master' into sami/logistiikka
Tsekki että ei mene vahingossa varattuun ja kappaleeseen samaa arvoa! Aikaisemmin saattoi insertöityä rivejä jossa varattu = 1 ja kpl = 1.
Merge pull request #259 from devlab-oy/tony/tilausrivivarattu

Bugikorjaus, tilausrivin varattu ja kpl ei saa olla samat
Muuttuja ja debug fix.
Debug echoihin koodit!
Voidaan hakea kaiken maailman myyntitilauksia!
Poistetaan virheellinen query.
Lisätty päivärajaus-hakuehto
Korjattu päivärajaus-hakuehtoa
Lisäominaisuus, jolla myyntitileille ja varastosiirroille tulostetaan halutessa myös lähete siirtolistojen ja myyntitilien lisäksi.
Korjattu siten, että JT-tilaukset ( alatila J, T ja U ) näkyvät myös Avoimet Tilaukset -listassa
päivän koodit talteen
Korjattu formfeedin ongelma lisäämällä ylimääräinen formfeedi
Revert "Korjattu formfeedin ongelma lisäämällä ylimääräinen formfeedi"

This reverts commit 29e2d74aff0b5ec158e1cc7c6d9977d3ae5c5b12.
revertataan muutoset masterista
DEBUG-merkintä pois
Formfeedit korjattu
Revert from master
Ei hukata käyttötarkoistusta vaikka LITETY-avainsanaa ei löydykään!
Teccom-laskujen stylesheetti!
pupesoft_sahkoposti-funkkari ei enää automaattisesti lisää file-extensiota, vaan se pitää päässätä ite osana filenimeä.
HOTFIX: Matikkaa ei eskapetettu.
HOTFIX: Korjattu otsikko.pgp tiedoston tietoja.
Ekotuksen kuntoon myös CLI-puolelle. (Laitetaan nää ny suoraan masteriin)
Uus konsepti: voidaan vaihtaa tuotteen kehahintaa!
Siirretään failien parserointi omana funkkariin, niin sitä voidaan käyttää läpi linjan missä ikinä tarvitaankaan.
Vähän fiilauksia vielä!
Hylätään viite jos se on nollaa. Silloin setataan viestiksi laskunumero tai jos ei oo laskunumeroa niin laitetaan ihan custom viesti viestiksi. Esim. "Lasku: 123 EUR"
automated commit from dev@dmehta Wed Oct  3 08:00:01 EDT 2012
automated commit from dev@dmehta Wed Sep 19 12:00:02 EDT 2012
UI: dynamic "add all to ..." (closes #157)

"add all" action link dynamically changes its displayed target according
to the current "editing" playlist, or to "new playlist" if no valid
target exists.
added missing transform to config query

without it, it refers to the boolean state of the Configuration object, which is different from that of its value, and pretty much always evaluates to True.
translate chapter1 on korean
Now with working skin previews for Mojong accounts
Fix ServiceRule
[maven-release-plugin] prepare release testexpert-1.0.5
Console Ping and Echo fully working
start of org files
added netlist readfile
Merge PR #944 branch 'dhruvgoel92/ticket/11032' into develop

* dhruvgoel92/ticket/11032:
  [ticket/11032] trigger error in case search fails
[ticket/11032] sphinx retries before triggering error

Sphinx connection retries should be done before error is triggered.

PHPBB3-11032
[ticket/11032] fix language for errors

Using proper error language for both admins and non-admins.

PHPBB3-11032
add reclinejs
Updated spawn redis library (copied from Melo's one on Redis module)
Fixed and documented failures requeue method

Documented remove failures method

Improved tests on failures class
Update Bio/PDB/__init__.py

I'm pypy you can't import Bio.PDB after import numpypy because linalg is not implemented. This lines solves the problem:

try:
    # Superimpose atom sets
    from Superimposer import Superimposer
    # Kolodny et al.'s backbone libraries
    from FragmentMapper import FragmentMapper
except:
    # Problem with pypy, don't support for numpy.linalg
    pass
Изменён подход к разделению обработки данных страниц. Добавлен класс Views.
Добавлен механизм редактирования метаописаний для страниц, являющихся программными модулями.
Fixed querystring on use of go button

--removed date from querystring
--date will only get appeneded whne it is explicitely selected
--removed redundant date code which is called when from and to date is None
--fixed incremental '&' issue which used to happen after use of explicit date and then changing of dashboards
Merge branch 'myisam_experiment' into test_server_alt
--request.gethost() bug on main site
Merge branch 'facebook_connect'
Second iteration of JS charts

-Expand view functionality
-Clickable Geog pie
-Prettier graphs
-Cleanup of code and moving javascript out of HTML file to separate .js files
update requirements (eulxml), corehq, vellum
preparing for deid exports
Site updated at 2012-09-07 23:41:29 UTC
correcting omega branch
Began Ruby Webcrawler
also document what I found out about these VAOs
fix RGB24 format spec :P
Fixed some bash scripting errors
Added support for taking into account starting/end time for shuttles
no more contact form. See my email in the main page
Update no-comply directory path in Makefile
client script fix serivce name
Next milestone completed. Now to add quantity to includes drinks.
Next milestone completed. Now to add quantity to includes drinks.
Delete all checked items added.
Merge pull request #299 from patrick-mcdougle/patch-1

Fixed comment for createQuery to include the variable name.
new user registrations work
removed default scope which was causing abstract scope issues, and replaced with an :alphabetical scope, which is now being used on the /materials front end left side bar menu
major refactoring of newly_crafted_with_images and with_finish scopes into their own methods (with_finish not working on front end yet)
fix bug in markup
Met icons + pull to refresh in subscriptions
updates for 12.04
udpated dotvim & dotzsh
Overhaul of search results page
Updating read me to include the 3rd party code I'm actually using.
타임라인에서 장소 상세정보로 바로 들어 갈 수 있는 기능 추가
*) Aplicados nuevos cambios al proceso de marcar como procesada una comunicacion asignada
Modified filepicker.io behavior
ADDED: well and field test, some minor issues
ADDED: Boreholes add
stash
stash
gitignore updated
.gitignore updated
Fix up plugin linkage (on non-Windows).
Fixes 'undefined symbol' errors when linked using '-z defs' (-Wl,z,defs).

Windows builds may or may not need the same fixup. I have no idea about that.
Fix spectator scoreboard clipping
Allow the model to have an offset specified in character.cfg
Merge pull request #76 from dsalt/linkage

Fix up plugin linkage (on non-Windows).
Add stencil ops to GL and GL3 shaders

Also add the GL3 shader's mask* to the GL renderer.
The stencil buffer may also be used for shadows in the GL renderer,
so this may cause artifacts if the shaders aren't careful to reset
any stencil values in the last stage.
Add a default case to silence a gcc warning

Spotted by DevHC.
Add stencil writeMask parameter.

It can be used to modify only a part of the stencil bits to avoid
interference between stencil-using shaders.
Add newline to state machine readme.
server support for user feedback using full dictionaries
Merge branch 'master' of github.com:dshafer/borkalizer
added new lyric page
Archiving header and XSL files previously deleted circa 2012-05-21.
Revert "rr snapshot."

This reverts commit 07eb9ac78d8b807562d0ed9443b5a9249cce7f18.
Revert "Adding local junit4 snapshot."

This reverts commit f319eded0ad384d5518bf7d8c056e6969a81a3c7.
Updating rr to 2.0.0.rc5
Fixed issue with search returning blank when typing too fast
Moved local upload directory settings to config.php. Changed parameters for file upload ID. Changed naming scheme for art and wallpaper to account for different content types
Adjusted file upload IDs so that they are unique
Merge branch 'master' of github.com:dxprog/dxMusicPage

Conflicts:
	api/apis/api.dxmp.php
Remove build, bin and JavaDoc from master branch.
Don't ask to enabled modules
i18n continue
add instructions, make display name clear in deployment, copy root files before customising
Grouping sqlite3 and adding version
adding ability to distinguish an authenticated user
start of work to add an auto difference utility to be able to track changes to a user's selected set of events.  This way when they relog in, they can be notified not only that an event's details have been changed, but what they have changed to and from.
adding the ability to set start and end times for the calendar as well as the ability to validate against these times
have set so that say 8am to 4pm validates 8 to 4, where as 8am to midnight validates 8 to 11:59:59 to keep in line with the original code
updating to Rails 3.2.6 for dummy test app
adding travis config
[SAM-22] downgrade sbt version
[SAM-16] Modified Readme file
No need to make location part of the behavior, we can get it from compile info
Docs for Fields
API review:

Changed the way field declarations are stored.
Enabled parameter validation at field declaration time.
Renamed some variables in Fields to enhance clarity.

Also made field_fields a part of field prototype instead of adding them on
instantiation.
Make nick coloring work in Emacs24
! Hide karma permissions if karma is disabled - thanks Illori for the report
netdev-dummy: create pipe&mutex only if listening

ovs-vswitchd keeps around several open instances of the same
netdev, even if only one of them is put into listening state.
We only need the pipe and the mutex for listening netdev-dummy's,
so we create them in the listen method.
Whitespace: eliminate hard tabs
Fix building cgi-bin programs on windows
Merge branch 'master' of git://github.com/encorelab/NEOplace
fixed a dumb mistake
Merge pull request #135 from miketissenbaum/master

dumb request for error
Example config.json file now using aardvark and drowsy
deleted fork and started again

the GitHub program would notupload any of my changes to the repository
because the repository had "errors" even though I haven't uploaded
anything since adding the 4 gangs last week. I've had to start again
with a new fork and a new clone.
I have now added the redemptionists. The bounty hunter house will still
give errors as I haven't figured out a way of making a special
characters house with its own fighter types (that won't show up as
fighter types in other classes).
if resolv.conf is a symlink just copy it instead of hardlinking it
Commit de Logs
commit de log de tareas
Tarea Iterator01
Merge https://github.com/eschafir/esteban-s
Some more refactoring work for VAR and FAVAR classes done
pass the Django request object into Store and Finder
Splitted ethzasl.rosinstall into multiple files, one per stack.
added a few comments on the latest commit for match results combinators
added a small enhancement to result matchers in order to deal with FailureExceptions
Spring Login Dialog without DB
Created CGPartyDaemon
better use local variables
Wiki update - Gradle-teamcity-plugin.txt
Better tool installation process.
modfy folders
added tests, moved load method into transaction and invoice classes, created find by for trans/invoice
Refactored and added random class method and tested
add style for class .resizable in popup
add newsbeature
Fixed: Make Null coverter instantiatable by new creation way.
Fixed: Set Null converter for ezuser and ezimage.

Correct for ezuser, but only a temporary solution for ezimage.
Fixed: Invalid Exception expectation in URLWildcardServiceTest
Implemented LegacyConfigResolver->getGroup()
LegacyConfigResolver->getGroup(): added a @todo about the interface
Merge pull request #88 from bdunogier/LegacyConfigResolver-getGroup

Implemented LegacyConfigResolver->getGroup()
Fixed CS issues introduced in 40172187edf9117684ddac4814a5b89b22c7231c
Fixed: code generated not following CS
Make knet_handle_* call compliant to documented API

allow knet_handle_crypto to be invoked at runtime

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
consistent capatilization of labels on APN settings fixes bug 800156
Bug 804114 - Do not delete invalid contacts groups

Somehow a contacts database can contains data that do not please the
current code, with 'start' being 1 and length being 0. This trigger the
following error:

E/GeckoConsole( 1084): [JavaScript Error: "NS_ERROR_INVALID_POINTER:
Component returned failure code: 0x80004003 (NS_ERROR_INVALID_POINTER)
[nsIDOMHTMLOListElement.removeChild]" {file:
"app://communications.gaiamobile.org/contacts/js/contacts_list.js" line:
291}]

And it also makes the loading ovrlay never disappearing. This change
fixes the behavior.
Bug 804150 - [settings] lazy-load some parts of the settings app r=kaze
[Bug 804450] Remove carousel "bouncing" overscroll behavior [r=vingtetun]
Bug 799427 - increase the padding for the text ellipsis between placeholder and arrow
Merge pull request #5948 from crdlc/remove-dock-bouncing

[Bug 804450] Remove carousel "bouncing" overscroll behavior [r=vingtetun...
Merge pull request #5934 from ttaubert/settings/bug-804150-lazy-load-parts

Bug 804150 - [settings] lazy-load some parts of the settings app
Merge pull request #5931 from lissyx/fix-contacts-overlay

fix: Do not delete invalid contacts groups
Merge pull request #5938 from ossreleasefeed/ensure-consistent-capatalization-of-labels-800156

consistent capatilization of labels on APN settings fixes bug 800156
Bug 804518 - buttons.css simplification
Merge pull request #5949 from basiclines/building_blocks-buttons

[BB][SHARED] buttons.css simplification
Merge pull request #5950 from yurenju/issue-799427

Bug 799427 - increase the padding for the text ellipsis between placehol...
use the Android APN database instead of the Gnome one
+ move all resources to the `resources/` directory
Fix PhutilMissingSymbolException documentation pointer

Summary: See rPHU91e4f9144e944c2653ce85174abc26099afa61d1. The controlling documentation moved to Phabricator after 'arc liberate', tailor the instructions for modern toolsets / doc locations.

Test Plan: Added "new Derp()" to a script, ran it, got a more useful/actionable error.

Reviewers: vrana, btrahan

Reviewed By: vrana

CC: aran

Differential Revision: https://secure.phabricator.com/D2129
Add Vimeo channel and group support
test
Merge branch 'master' of https://github.com/fannar82/Confusion

Conflicts:
	list.txt

m�hahaha -F
Merge branch 'master' of https://github.com/fannar82/Confusion

Conflicts:
	list.txt

skil
added PublicOffer action
Added actions and handlers
Moved trade in to a new package.
test
Merge branch 'master' into group5
fleshed out public offer class and added simulation parameters
Merge branch 'group5' of ssh://github.com/farhanrahman/kyoto into group5
Renamed AnnexTwo.java to NonAnnexOne.java
More work on initiate trade and public offer action objects
Extracted TradeType as a separate Enum
Merge branch 'development' of github.com:farhanrahman/kyoto into group1
Taking a different route: this does not yet compile.
More
merged in changes on development branch
End of day merge from group5
Merge branch 'master' into development
Simplified TradeProtocol.java to show my intention. Feedback wanted
Test committ
ct test
ct fails
Fixes #76, joining and leaving Kyoto now returns void and throws exceptions
version 2.0.1 bump
Fix fatal bug in previewing code.
adicionado versão python puro da Pratica1x
xMerge branch 'master' of https://github.com/fccoelho/curso-IRI
Fixing up the README

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Renaming the compiler and fixing up some tests.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
src code of sql part of squall and squall_plan_runner merged to a single src dir. This dir contains sql and plan_runner packages as the top ones. Automatically generated Hyracks plan additionally optimized.
ColumnReference evalString much more efficient - conversion toString and fromString avoided when evalStr is invoked. This way,  a Date column will be sent around as String and it will not be converted to a Date unless some operations require Date type.
TPCH 5, 7, 8, 9, 10 work for any order with Name recognition.
Small improvements for SelectivityEstimation (for AndExpression no overprovisioning). Pushing Or implemented and tested for the only query using it - TPCH7.
NameGenerator successfully recognizes the columns which are projected away - right parent hashes. They are called synonims.
Everything in place for specyfing different optimizers from config file.
specifying optimizer from config file. For now, these are supported: rule-based bushy, rule-based lefty, annotation-based lefty (a user can specify a lefty plan w and w/o specified parallelism) and cost-based optimizer. Good news is that the cost-based optimizer generates the best plan in 6 out of 7 tried TPCH queries. When I said the best, I mean the best among several plans generated using annotation-based lefty optimizer.
Cost optimizer now has filtering at the end of each stage akin to Selinger-style optimizer. A small bug regarding minTotalPar fixed. A bug in NameRuleOptimizer fixed - the problem was related to joining components with no join condition.
Installation procedure includes storage requirements. Timeout for collecting results increased, necessary for huge parallelisms. Removed config files for database size which is not bundled in Squall.
Merge branch 'master' of git://github.com/avitorovic/squall
Escaped certain strings in the Definitions sections due to presentation issues

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>
adjust name and repo page
~ Add run function (hacked)
~ Added printSeating method
Removing emppty meta tags (description and keywords)
Update FABatching.h
Added different ammo consumption for different weapon types.
Merge branch 'master' of https://github.com/flags/ZombieSunday.git
Initial Commit of v0.1
Blank with Initial merger
improvements
Merge branch 'master' of https://github.com/foocoders/QR-Resto
aggiunto fadeOut per i messaggi di alert/notice/success
impostata validazione utente, semplificato il routing
Added Add Service dialog window
At least use JAVA_HOME variable for the Java path... really need to make a better build system.
map editor good source
getting ready for version 7.1.64
Added unlicense file
Let "wait-time" be a function that returns the time to wait.  Includes test.
Merge pull request #18 from okcwest/backoff-fn

Let "wait-time" be a function that returns the time to wait.  Includes test.
[AS7-3918] TS Clustering: remove hardcoded package name (EJB JNDI util would come in handy here -- TODO)
[AS7-2847] Clustering TS: workaround for running one test with -Dtest=XYZ by re-ordering surefire executions
Workaround for ARQ-775 - one-letter-per-line with.
Workaround for ARQ-775 - one-letter-per-line and doubled newlines.
AS7-2909 - remove surefire.test.failure.ignore as it's not serving original purpose (not skipping second SF exec). Use -fae instead.
adding password masking tests + merging some conflicts
[AS7-3885] Detect if no new line at end of the properties file and write one before new entries when appropriate.
[AS7-3942] Report an error for an incorrect value and represent the prompt.
[JBOSGI-526] Duplicate org.jboss.osgi.metadata types in repository and resolver
Add missing balancer in the description.
AS7-3923: add a method in the SecurityTest class to use a login module of choice and module options
AS7-3824: use the new createSecurityDomain method to get the JCA login module
[AS7-3692] Allow optional parameters TRANSPORT and PROTOCOLS to stack add().
AS7-3960 Unable to set datasource attribute flush-strategy via CLI
AS7-3862 Configuration of statement tracking fails, according to XSD
don't acquire lock on read
in case there are no async task, just set the cancelled state
limit mgmt operation handler thread-pool
reuse existing placeholder resources
[AS7-2653] re-enable the server mgmt test
added some initial comments from the web page to outline. NO NOTES FROM CLASS.
Borro error de logica en el calculo de los deltas intermedios.
cambio estructura base del test por una de 2 capas en vez de un perceptron simple
Adds documentation directory to .gitignore
Adds rdoc task to Rakefile
sound tweaks
Merge branch 'master' of github.com:geenux/StartRacing
Merge branch 'master' of github.com:geenux/StartRacing
Fix stopping VoiceRender
Fix enginephysics and burst
Mise en place sauvegarde de la paye
Validation CRA avec verification
sci-physics/root: sync with tree

(Portage version: 2.1.10.63/git/Linux x86_64, unsigned Manifest commit)
margins are depends on screen size
margins are depends on screen size

Conflicts:

	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'ice-cream-sandwich' into beta-ics
show extra fields if only catalog title is not found
fixed skip method
tx => notx
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
item is moved to TODO.1.4.5
StringMethod.callForCppString()
no crash if file can not be open for writing
exception throwing (in progress)
code simplification
parameter has been removed
code cleanup
Merge branch 'master' into external-formats
inforeader removal
unzip moved to external plugin
fix
fix
Merge branch 'external-formats' of https://github.com/geometer/FBReaderJ
fix
native => beta
armeabi only
Merge branch 'master' into beta
Merge branch 'master' into external-formats
Merge branch 'external-formats' into beta
external-formats in merged into beta and has gone
Merge branch 'master' into beta
JavaEncodingConverter (in progress)
standard android logging method
Merge branch 'master' into booksdb
code is changed to be more similar to the code in beta branch
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/zlibrary/ui/android/view/AndroidFontUtil.java
1 more fix in unzip code
version number => 1.4.6
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
cahnges
confi via yml
Fix typo in contenthandler documentation

Change-Id: Id03f854eca4b6c53ecd535422b779bf8a459750d
Bug 40756 - API: Call to a member function isGood() on a non-object in ApiDelete.php

Change-Id: I88eefe177f1f6d77bed035ebe4967a8c714615f4
Add missing version number to wfDeprecated calls

Change-Id: I8b9efaf5eafc6cfecb34d401574ce978899d3990
Add @since tags too Hooks

Update some method documentation

Change-Id: If4913aab7d0f8c14d49ca8320e31b1b354145c83
Merge "Add @since tags too Hooks"
Merge "Bug 40756 - API: Call to a member function isGood() on a non-object in ApiDelete.php"
Update notes for submitted changes

* Fix WikitextContent::getSection() for missing sections
Update jStorage from upstream v0.1.7 to v0.3.0

Upstream:
* src: https://raw.github.com/andris9/jStorage/v0.3.0/jstorage.js
* log:
  https://github.com/andris9/jStorage/compare/v0.1.6.1...v0.3.0

Did not maintain the modifications made as they were not
necessary (only stylistic), and jStorage is already listed in
the .jshintignore file.

Change-Id: I9c92c47ef165157a40412100e9e532bce36fc638
Merge "Update jStorage from upstream v0.1.7 to v0.3.0"
Update notes for submitted changes

* Revert "Release notes: Get back lost history"
Update notes for submitted changes

* Release notes: Get back lost history
Use Html class instead of Xml where possible in Special:Contributions

Also simplified the code by using Html::rawElement() instead of
openElement() and closeElement() and added some lines breaks to
the output for better readability.

Change-Id: Ie7ce5c65ba34b30799580acda0a9d82eb38d257f
Merge "Use Html class instead of Xml where possible in Special:Contributions"
Localisation updates from http://translatewiki.net.

Change-Id: I6cbab03f0e9af894789a03879afda65aec946f8f
Remove svnstat stuff used in Doxygen generation

Change-Id: I9d8db5fae6e0c99d59fcb9a43d7ed4aab953c300
Merge "Remove svnstat stuff used in Doxygen generation"
(bug 9237) SpecialBrokenRedirects.php: Exclude iw redirects

* Cleaned up code
* Difference:
  Added `(rd_interwiki IS NULL OR rd_interwiki = "")` condition.

Change-Id: Ifee9fdcdd3a327742b18cfcc2a235e1e24c062bf
Added back in SSL_RSA_WITH_RC4_128_SHA due to lack of server support for DHE #189
Cleaned up daemonness of thread
Fix up the exception messages
Packaging 1.6.0-6
Implemented combo edit
adding quiet asset gem
support filters by date
Remove sidebar in groups new
Fix document icons
Include author and user_author in Activity#audience
Broadcast tie activities as post activities
Fix change image in security selector
Put button in one location
add list items to "main area" of day view, with ko
Fix AR thread warnings.
Finalised styles and first post
eliminated some spam lat/longs
update edit and sessions
unknown problems caused by rubymine
Problems with Registration form introduced by Rubymine. Corrected and Registration form working as expected
Final update for version 1.0
add 賞析
ENH: no use for info.vol.mod and info.vol.cond
Merge branch 'master' of github.com:gpiantoni/baseproj
arch config: do things in the correct order
* fixed writing jvm type for string constants after r22020

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22123 3ad0048d-3df7-0310-abae-a5850022a9f2
  * fixed null-termination in StringToWideChar() if the buffer is larger than
    the string (mantis #22669)

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22124 3ad0048d-3df7-0310-abae-a5850022a9f2
  * changes from r21697, 21707, 21843, 21861, 21701, 21887, 21899 and 21900
    to systemh.inc/system.inc/compproc.inc 'merged' into as of yet still
    JVM-specific copies of those files

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22125 3ad0048d-3df7-0310-abae-a5850022a9f2
  * fixed uninitialized TJasminAssembler.ConstAssignmentValue() function result

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22126 3ad0048d-3df7-0310-abae-a5850022a9f2
  * fixed java.lang.String and Pascal string comparisons after operator
    overloading rewrite (consider java_jlstring to be "stringlike")

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22127 3ad0048d-3df7-0310-abae-a5850022a9f2
* rtl/m68k/m68k.inc, move:
    add a check for "count = 0" which happens e.g. inside of System.Assign if called with '' as filename (which is the case inside OpenStdIO)


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22841 3ad0048d-3df7-0310-abae-a5850022a9f2
* Added a typecast to avoid range error in 64-bit debug builds

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@20596 3ad0048d-3df7-0310-abae-a5850022a9f2
* fixed if-simplication for C-style booleans by considering all values
    different from 0 to be "true", instead of only 1 (patch by Jeppe Johansen,
    mantis #23436)


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23117 3ad0048d-3df7-0310-abae-a5850022a9f2
Set needgsed to 0 for non-NetBSD systems

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21823 3ad0048d-3df7-0310-abae-a5850022a9f2
* Added UniversalTimeToLocal LocalTimeToUniversal as per bug 17435

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21866 3ad0048d-3df7-0310-abae-a5850022a9f2
* Use A_NEGU (without overflow check) for OP_NEG op_reg_reg

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21615 3ad0048d-3df7-0310-abae-a5850022a9f2
fix for GRAILS-9447 "Where query cannot cast Integer to Long"
added note on failure recovery

this should address #338
Closes application when operation is completed.
OOZIE-981 Subworkflow lib not found in classpath when parent workflow lib overwrites it (mona via virag)

git-svn-id: https://svn.apache.org/repos/asf/incubator/oozie/trunk@1381697 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-984 Allow EL Functions in Coordinator timeout (rkanter via tucu)

git-svn-id: https://svn.apache.org/repos/asf/incubator/oozie/trunk@1381716 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-975 Test cases should not load all the services classes (virag)

git-svn-id: https://svn.apache.org/repos/asf/incubator/oozie/trunk@1381725 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-973 Allow Oozie to run against Hadoop trunk branch (rkanter via tucu)

git-svn-id: https://svn.apache.org/repos/asf/incubator/oozie/trunk@1381815 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-988 Improve verification of TestJavaActionExecutor.testLibFileArchives (rkanter via tucu)

git-svn-id: https://svn.apache.org/repos/asf/incubator/oozie/trunk@1381819 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-809 MySQL TEXT columns should be MEDIUMTEXT (rkanter via tucu)

git-svn-id: https://svn.apache.org/repos/asf/incubator/oozie/trunk@1381820 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-987 Fix minor bug in one of the uber jar tests (rkanter via tucu)

git-svn-id: https://svn.apache.org/repos/asf/incubator/oozie/trunk@1381824 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-809 Amendment (adding patched now)

git-svn-id: https://svn.apache.org/repos/asf/incubator/oozie/trunk@1381833 13f79535-47bb-0310-9956-ffa450edef68
tmux: better user@host:session scheme
fix Ant release build: point docGDK tools to ASM 4
remove javadoc warnings
port fix from master for GROOVY-5626: Remove buildSrc's target and .gradle directories from the source distribution