labofsahil/github-event-dataset-2012 huggingface dataset:
Add interceptor to check whether a user is authorized to reset (a) node(s). (relates to #200)
Add interceptor to check whether a user is authorized to reset (a) node(s). (relates to #200)
Merge branch 'develop' into feature/ticket200

Conflicts:
	iwsn-server/src/main/java/de/uniluebeck/itm/tr/runtime/portalapp/WSNServiceHandleFactory.java
Merge branch 'develop' into feature/ticket200
Authorization annotation added to those methods in WSNServiceImpl which require authorization
Comment added to IWSNAuthorizationInterceptor
Fixes #221 (UninitializedMessageException in iwsn-server when resetting nodes via experimentation scripts)
Merge branch 'develop' into feature/ticket200
Merge branch 'feature/ticket200' into develop
Merge branch 'develop' into api-adaption
[59] Add untested rate calculation method
OS X in gitignore
Second from CI
controls: fixed case-sensitivity names
fixed ajax requesting and next and previous post function
Implementing #417: __version__ in python interface
automatic documentation update
Error when trying to use the Collocation class (which is not ready to use)
Merge branch 'develop' of github.com:casadi/casadi into develop
utensiltarian repoduction
Strumienie polepszone
Added support for switchable keyboard layouts.
Implemented keyboard support for TF300T.

Disabled keyboard shortcuts for menu items (as they
  conflicts with Ctrl-? in SSH).
Improved touch and BACK key handling for TF300T.

The BACK key is now only handled as escape when hit on the screen and
  not when touched on the screen (in the system bar).
The touch screen overlay (that shows Esc / Ctrl toggles) is also now
  disabled when using the TF300T hardware keyboard.
Added missing changes from previous commit.
Added contributions from Imre Gergely for TF300T.
Merge branch 'master' of https://github.com/hach-que/ConnectBot

Conflicts:
	src/org/connectbot/service/TerminalKeyListener.java
Remove the JRuby build option for now
Run until we crash
Add blaze-html-0.5 post
Updated drag-and-drop behaviour to use jquery text() function when updating div's inner text.
Updated demos to match changes to SCION API.
Added better error handling.
Remove useless Pre-Depend on dpkg for php5-fpm
first half of book
Merge branch 'master' of github.com:jblackem/hardpython
Added CR4 BOMs to JBoss Stacks
Optimizing Deferred so only "then" will force async enqueing.
Bug 396437 - PageUtils does not support URITemplate parameter that contains "=" in its value.-- A simpler regEx solution suggested by Simon.
Add Orionode
Orionode: fix path to orion client code
Bug 393595 - [shell] Shell commands with significant whitespace
Orionode: update repo URL in package.json to point to this repo
Updating Query parameter handling based on feedback from URL Spec list
Merge branch 'orionode'
Bug 396224 - Regex replace all doesn't handle capture groups
Fixed lint and NLS warnings
Don't replace when there is no match
Updated copyright to reflect contributed fix.
Orion node module to ignore /lib/dojo/ folder
Removing unused dependencz to orion/editor/regex
Removing dojo from mini-chooser, and reworking Select and Labeled Select without Dojo to be used in other settings pages.
Merge commit '92ef244d81d97d736cbf0b9298551fa7bcb647b0'
Bug 395391 - dojo/dijit-free editor page.
Add undeclared dependency to remote prompter dialog.
Remove old versions of OperationsDialog
Updating URL shim to make is a simple stateless facade on top of anchor.search
Finish sign in & play with Cucumber
partway thru new species selection
Merge branch 'master' of github.com:jcu-eresearch/Edgar
handling species panel properly
Merge branch 'master' of github.com:jcu-eresearch/Edgar
Merge branch 'master' of github.com:jcu-eresearch/Edgar
Suppression de motifs-hdd.txt
Working changing resolution with showing what resolution you actually change to.
Adds MacVim rc file
Adds vim rc file with lots of settings
Merge branch 'pull-1'
mad updates
parser now scrapes from internet
Move config reification into factory classes
Descend monitors from MonitorBase

This abstracts away how the alert is performed. It also restricts
monitors to use only the correct alerting levels.
Added some small test case
more date fixes
more fixes
Ficheros del FakeFacebook
Vista Videos
fix addAll to not wrap JsonElements with a primitive(..)
mongoid config
mongoid yml
put debugger into dev test group
add sf config
salesforce init and yaml
sf initializer
ui stuff
bug fix
limit terr drop down to 8
removed nav links
css style updates
modified:   aex.mac
	modified:   combinatorics.lisp
	modified:   partition-list.lisp
	modified:   strings.lisp
	modified:   table.lisp
Document section was not being changed correctly.
Adds rake task to find functions without corresponding test functions.
Updates Travis to fail if there are untested functions.
Adds and cleans-up functions that having missing or mis-named tests.
Updates test data to reflect added tests.
Merge pull request #21 from jlsherrill/pulpv2

Pulpv2 - don't use sort for things we don't need sorted
Merge branch 'master' of github.com:Katello/runcible

Conflicts:
	test/fixtures/vcr_cassettes/extensions/repository_associate.yml
	test/fixtures/vcr_cassettes/extensions/repository_create_with_importer.yml
	test/fixtures/vcr_cassettes/extensions/repository_dissassociate.yml
	test/fixtures/vcr_cassettes/extensions/repository_extensions.yml
	test/fixtures/vcr_cassettes/extensions/repository_unit_list.yml
	test/fixtures/vcr_cassettes/repository_support.yml
	test/fixtures/vcr_cassettes/task.yml
Version bump.
Updates to fix missing cassette and switches each content type to extend Unit resource.
Merge pull request #22 from ehelms/master

Addresses untested functions by creating a rake task to locate them and adds those missing tests.
Docs - Adds yard doc for repository.
Merge pull request #23 from ehelms/master

Docs - Adds yard doc for repository.
fix hardcoded host
Cambiado add
Don't run rvm before checking for it
Merge branch 'master' of github.com:jmartindf/oh-my-zsh
minor tweak. already forgot what it was. commenting out debug info i think.
Auto-update: 07-Dec-2012 16:25:05
Auto-update: 07-Dec-2012 16:14:34
Merging latest script
Blahblahblah lots of stuff.
Merged with master.
Removed unused import and moved resizing of the render rect to when tile size is changed.
Made the TimerTool use the Logger instead of System.out.println().
Created a counter tool and object used to sount and check how long time things take.
Added ammo multiplier to weapons
Ammo pickup logic. Fixes #35,#31
Chance for itemspawn with each enemy killed
Ammo crate now adds ammo to all weapons
Merge with master
Merge branch 'ammo'
Buffed grenade and machinegun damage
Logger for ammo/medpack spawns
Removed dead code
Allow matrix arguments in slog.m. Closes #49
Better and faster support for nonlinear parameterization in optimizer
fix some multi-threaded and reporting issues
first generic items to add to xolawareUI
simple map view controller with annotation capability
add capability to track a transient cell while retrieving info to populate it with that's not local
deal with rotation
add photoId in order to track this as a transient cell, reused by the UI
this used to be MasterViewMasterTableController.  trying to make it a little more clear what it contains by renaming it.
added xolawareOpenSourceCopyright.h and included in all appropriate files

template for copyright : http://www.opensource.org/licenses/mit-license.php
retrieved from https://github.com/idevsoftware/Cocoa-Touch-Additions

used by permission
modified slightly to have a shorter animation time (.2 instead of .3)
variety of bug fixes & enhancements

change the colors of the app to be primarily shades of grey with a bit of highlighting
add a single-tap to allow the bars to be hidden when viewing a photo
re-organized the ScrollableImageDetailViewController to take advantage of the tab-bar hider
fixed problems in parsing when the placeURL is giving data that doesn't match the place name
UIViewController+UISplitViewControllerUtilities.h renamed to UIViewController+MasterDetailUtilities.h
renamed to UIViewController(MasterDetailUtilities) / UIViewController+MasterDetailUtilities .h/.m from UIViewController(UISplitViewControllerUtilities) / UIViewController+UISplitViewControllerUtilities .h/.m
didn't like these utilities.  they didn't seem appropriate.
a new variation on the MasterDetailUtilities for UISplitViewController

the old version appears to have a @selector conflict with an internal masterViewController function;
so the names have been changed slightly

also, masterTabBarController was added in case the split-view-controller master is a UITabBarController
scrap the old UIViewController(MasterDetailUtilities) in favor of the new UISplitViewController(MasterDetailUtilities)
a kludge workaround for the buggy behavior in split-view delegates when apps start in landscape mode
updated the delegate protocol to have a call to segue from the leftAccessory of the annotation,
and then implemented the ability to perform this segue
allow MapViewController to initiate a segue for annotation even if the destinationViewController is not yet known

move the mapPopover to be a MapViewControllerDelegate property, so its use by ScrollableImageAndMapMasterTableViewController
can be referred to.  then, for iPad (split view controller, where map could be in either view or in popover) at least implement the case where
the map is in a popover
better as acceptSegueFromAnnotation:forDestinationViewController: (vs destinationViewController:acceptSegueForAnnotation: ]
copyright cleanup
a receptacle for utilities to aid in debugging
Enable (1) vim modeline
Mark .aliases as ft=sh
Remove psql alias
Merge branch 'master' of github.com:johnmastro/dotfiles
ISO 8601 compatible timestamp function

The function `core_timestamp_format_iso8601` returns a string representation
of `ts` that is compatible with the ISO 8601 standard at the level of seconds.
commit cd75ced6a31324c05ad200dbaa106eccc79681c3 1 parent 23fcdb942f
CHange the CircularDependencyException parent
Implemented the form data proccessing
Great class reorganization. No testing done yet, so many thing is
propably broken for now.
Updates. Way more tests.
More and more and more. Its a test-a-fiesta
updating jsdom
Initial commit

Signed-off-by: jörg <jörg@192.168.178.20>
Added path to css, js, and images
might need this later
more docs changes
Added PyAML to install_requires for explicitness sake.
Added JOBS_DIR setting instead of assuming backups jobs will be in /etc/ari-bakcup/jobs.d.
Added and beefed up several sections.
* added Audience section
* added snippet on how to install as a Python package
* fleshed out section on using ari-backup with cron
* fixed some typos
Success: www/webkit-gtk2 v1.4.3_2
Success: x11/yelp v2.30.2_6
Success: net/liferea v1.8.7
fix currency privs
Fix previous publish date
Fix broken links
Fix API doc structure, where framing was not included in the algorithms section.
Merge pull request #11 from jstanley0/original_version

validate SAML assertions via libxmlsec
gem version bump
use the openssl crypto functions explicitly

the "Crypto" versions are #defined to OpenSSL versions on Linux,
and FFI of course cannot follow that.
Merge pull request #572 from jsteffen/master

added migration from 2.9-beta to 3.0
Lots of changes to the iterators. They now work, and are true random access iterators. The containers still need the .end() method
Lighter <del> text
#JC-625 Added a model, a mapping, the migration 17, a DAO and basic
tests for CRUD operations.
Merge branch 'develop' into develop.senleft
#JC-625 The comments coverage was increased.
Merge branch 'develop' of jtalks.org:jcommune into develop.senleft
Merge branch 'develop.senleft' of jtalks.org:jcommune into develop.senleft
#JC-630 The postList.jsp changed for a displaying the poll. Custom tag
for poll was added.
#JC-625 The transition from "Voting" to "Poll".
#JC-630 Checks added in the poll.tag. Comments coverage increased.
#JC-630 Added poll with multiple choices.
#JC-630 Hiding the components after the vote.
#JC-629 adding voting controls to newTopic.jsp - custom tag with poll UI elements, localization messages, JS helper script with datepicker
#JC-629 fixing datepicker behavior to default locale
#JC-629 fixing datepicker behavior to default locale
Merge branch 'develop.senleft' of jtalks.org:jcommune into develop.senleft

Conflicts:
	jcommune-view/jcommune-web-view/src/main/resources/org/jtalks/jcommune/web/view/messages_en.properties
	jcommune-view/jcommune-web-view/src/main/webapp/WEB-INF/tld/jtalks.tld
#JC-629 Added draft version poll creation handling service methods
#JC-629 Added draft version poll creation handling service methods
#JC-629 Added worked version poll creation handling service methods
#JC-630 Test coverage increased, a error message added in a page.
Merge branch 'develop.senleft' of git@jtalks.org:jcommune.git into
develop.senleft

Conflicts:
	jcommune-service/src/main/java/org/jtalks/jcommune/service/transactional/TransactionalPollService.java
	jcommune-service/src/main/resources/org/jtalks/jcommune/service/applicationContext-service.xml
	jcommune-service/src/test/java/org/jtalks/jcommune/service/transactional/TransactionalPollServiceTest.java
	jcommune-view/jcommune-web-controller/src/main/java/org/jtalks/jcommune/web/controller/PollController.java
	jcommune-view/jcommune-web-view/src/main/resources/org/jtalks/jcommune/web/view/messages_en.properties
	jcommune-view/jcommune-web-view/src/main/webapp/WEB-INF/tags/poll.tag
	jcommune-view/jcommune-web-view/src/main/webapp/resources/javascript/custom/poll.js
#JC-630 The prohibition on the poll to users that have voted.
#JC-775. Broken user avatar in pm.
Use let inside spec.

Signed-off-by: François de Metz <francois@stormz.me>
Fix alt attribute on img if the title is not present.

See judofyr/ruby-oembed#23.

Signed-off-by: François de Metz <francois@stormz.me>
Finish the move to let in the OEmbed::Response spec
Slight re-organization of the OEmbed::Response::Photo spec

...and update the CHANGELOG
Merge pull request #25 from francois2metz/photo_alt

Fix OEmbed::Response::Photo#html if no title is returned
Removing Gemfile.lock from version control

Based on http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
Update Gemfile, removing gem dependency info

Based on http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
Remove the Jeweler dependency.

Trying to do things the bundler-only way.

I realize in order to build the gem, you'll also now need to have git installed, but I don't think that's too big of a hurdle these days.
Tests shouldn't care about query param order.
Bump to 0.8.8

Including a few last-minute CHANGELOG tweaks
backup以下は管理対象としない
Getting the installer to do some of this dirty work...
Make importlib dependency only take place if you need it
Merge branch 'bugfix/conditional-importlib-requirement' into upstream

No review for this one, sadly.
Add tests and adjust roundup implementation to be scrapy-ified
Switching "yield" for "return", on suggestion of johnmorr
Move creating the RoundupBugParser into handle_bug_html_response, on suggestion of johnmorr
Removing stubbed-out data transits, as suggested by johnmorr
Remove unused imports
Move scrapy spider out of .trac
Adjust test suite for new location of BugImportSpider
Adjust docs to point to main.py for BugImportSpider
Merge branch 'feature/roundup-gets-scrapy-fied' into upstream
Merge branch 'master' of https://github.com/openhatch/oh-bugimporters into github-api-v3
be nicer on memory by yielding each bug instead of accumulating them
interrogate labels as a set, not lists
BugImporter ReactorManager is on its way out with the scrapy refactoring
nuke copy pasta
more copy pasta
canonical_bug_link should be a human-parsable link
initial commit v0.05
fixes #75. logo border
fixes #76. add button
coded in the feature to add job
(view, javascript, template)
added modal
Return to UpdateTarget
Added essentials remaining list/tab

- Updated helper spec
- Updated locale
W wiadomosci przerobione tablice na QList oraz dopisany destruktor
Poprawiona funckja zwarająca listę indentyfikatorów w profilu
Dodana obsługa przycisków zmiany statusu oraz usunięte wywalanie się programu gdy następuje błąd połączenia
dodanie wysyłania wiadomosci zmiany statusu
Update bin/json.sh
use inspect to gather members for text_command_classes
competitor pdf bug fixed
renamed mat file
Removing an unnecessary comment
ディレクトリ構成を本番と同じにした
Fix param from source to content
CSS updates, a couple changes to grunt and the core js

Signed-off-by: Ryan Struhl <keisans@me.com>
Merge branch 'master' of github.com:kenbolton/mezzanine
Merge branch 'master' of github.com:kenbolton/mezzanine
fix small bug
Able to add credit to user
Able to do transactions now
Able to order for rollup stand
Ending a touch when it leaves the boundingBox...
Finished prototype section.
revisions of file and claim lookup functions, other changes
first preview
created group project with only pstreamer
add pstream_server
fixed Library
Example git commit
Sorting out routing
add optional global completion
Opprettre hallo.txt
laster opp test
Added function to return local ENU frame given lonlat.
delete sif brise i sifv stavke koje treba
fixed imports in specifications to match new organization.
First pass at mass moderating for comments
Allow flexible per_page for comments
Add keyframe animations for slide changes and expand example slides.
Post update support
functions start to look like functions
Update MvcApplicationCommon/MvcApplicationCommon/Views/Shared/Error.cshtml
Update REAME on master
Merge branch 'master' into experiment

Conflicts:
	README
embeddable search, better crap
add option: setting max_hops
fix CLJS exception handling during tests
change y-or-n-p
スタートアップメッセージを非表示
increased height of the graph view
fix bugs
Cat.recurseTree
update ArchWikiRemoveCategorySuffix
rename functions with async as default
UpdateCategoryTree asynchronous
Use default signature in :respond_to?
Modification total recapitulatif
Merge branch 'master' of https://github.com/laem/RDD_MinesNancy
Ruby requires zlib and openssl
fixbug ing
add a cube, everything is easy
fix bug
onlineing
AD-1 hotfix october
Merge branch 'hotfix/hotfix-october'
Add an autoconf test to test whether the .section .gnu<warning>
works with the linker on the system, and define _warn_references
to nothing if not.
account signup form in place
More portfolio improvements
bok choy - created
fixed obsolete Tuple() call
Added some sandbox files
added IEDF to pullData
Merge branch 'master' of github.com:laz0rviking/runJobs
walking/standing up & down
player left and right
failed attempt at autotiler, let's try again
tile spriter
basic autotiling
disable some log info
Changed like --- Everything
Update magic/README.textile
fixes
Merge branch 'master' of github.com:lennyjpg/scetchbook
Exercicio ate unidade 12
initial commit
Merge branch 'master' of github.com:levansuper/skeleton
at last
Fix bux with profile in user registration
Generated profile controller
Add status validations and tests
vertical swipe and audio drag
awww:(
2012-08-01 13:41:01
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vimrc.bundles.local
	.vimrc.local
Basic Project Template
Catch exception...
Correct User entity class
Lighting and Texturing enabled

Texture included in push
project sources and libs
start adding markdowns for documentation
add CNAME file
Site updated at 2012-10-14 18:00:53 UTC
Debranded application name
Add missing column for SCOPE_CATALOG.
delete println
Fixing various failing integration database tests, especially around catalog/schema logic
Commit 2

text Commit 2
Add RabbitMQ monitoring

Add rabbitmq::monitoring recipe

if monit is enabled, add rabbit to monit.
if collectd is enabled, load the rabbitmq collectd plugin
update bootstrap gem and style
Warreward
MyMonster model
MyMOnster controoler
README - further teensy refinements to the intro, issue #3
Minor Fix for pushing translations.
Updated version number and fixed an issue with building translated
books.
implemented icd method, still to finish for transform
??
Character willpower
Update i18n/es_ES/strings.inc.php
bump version number to RC10
Merge pull request #60 from sareche/patch-19

Patch 19
Update i18n/es_ES/strings.inc.php
Merge pull request #61 from sareche/patch-20

Patch 20
Merge branch 'next' of github.com:thebuggenie/thebuggenie
don't reveal the php version in the X-Mailer header when sending emails
don't include the 'to' header when using the php mailer and instead include the recipient names in the 'to' parameter

Conflicts:

	modules/mailing/classes/TBGMimemail.class.php
fix the buddy name being interpreted as an email address when sending activation emails

Conflicts:

	modules/mailing/classes/TBGMailing.class.php
fix wrong order of parameters to addTo in TBGMimemail
Merge pull request #62 from dscharrer/next-mailing

The mailing fixes from pull request #45 ported to 3.2
make sure tbgidentifiablescoped extends tbgidentifiable (fixes #1395)
make project team editing a bit more dynamic
Add further optimisations to the timezone fixer (now uses a less memory-intensive way to populate the user data, and processes after indices created).

Enable PHP 5.3's superior garbage collector
Merge branch 'next' of github.com:thebuggenie/thebuggenie into next
remove webfonts from htaccess template
Merge remote-tracking branch 'origin/next' into next
Merge branch 'next' of github.com:thebuggenie/thebuggenie
Merge branch 'next' of github.com:lubosdz/thebuggenie
Pre-nota
subiendo sql boligrama2_2
Merge branch 'master' of https://github.com/luisalein/Boligrama
added public_activity
Merge branch 'master' of github.com:luismiranda/tipster
better table
tests
module internet of events added!
Added dropdown select field on events view
Clean up dict usage.
Contest feature added
Merge branch 'master' of https://github.com/huubbouma/tvgrabnlpy into experimental
Integration of: libGitWrap

Updating libGitWrap
    From: a43244a16c9af4184234682859fa0bb22e3f59a3
    To:   ddbdce20954eb747c8afce8ba315a714adf89a46

Babbelbox's Jenkins (1):
      Integration of: LibGit2
GitWrap: add missing Remote-CCTor
GitWrap: Add methods to remote
GitWrap: Initial Background workers
ModRepo: Feed clone info to workers
Sets constant CSV_HANDLER to ::FCSV when using Ruby1.8, else it will be set to ::CSV
Change the workflow according to the suggestions made by Clare and Catherine.
first commit
First commit of EA-Explorer Solution

Signed-off-by: makulik <g-makulik@t-online.de>
Merge branch 'gh-pages' of git@github.com:makulik/EA-Explorer.git
Added README text

Signed-off-by: makulik <g-makulik@t-online.de>
Added index.html

Signed-off-by: makulik <g-makulik@t-online.de>
fixing some return key mappings; some new window management defuns
ido-menu
a lil more love
프로시저
[DEV 0009] Fix Nalorakk Event

Signed-off-by: Salja <salja2012@hotmail.de>
[0160] Forgot from last Commit.

Signed-off-by: Salja <salja2012@hotmail.de>
A bunch of new functions now sort of work
error 502 für nicht erlaubte geometrien eingefügt
Small update to balanceInput
Finish styling homepage
Process next actions testing.
Testing process
deal controller
basic step controller and actions
New step
add hbox around arguments -- prevent splitting
switch to xframed
explanation of the first part
remove following breake
Some inspiration from AdaTheDev/MongoDB-ASP.NET-Session-State-Store:

* Smarter locking of mongo data
* Use SafeMode with configuration settings
* Do proper mongo update for existing items when releasing lock
* More synced update of cache when updating mongo
Update version
Add SQLB
Overriding Command::error so errors can be sent to PHP error log
Make multiplexing mode combinator more powerful
moved all included js libaries to public git repo
Set properties before saving a rule
Added actual name data to the ngram formation code; includes some timing results
Centralize plug-in configuration

Change all plug-ins to get their configuration from
/etc/openshift/plugins.d/*.

The motivation is that an administrator should not need to edit Ruby code
in order to configure the broker.  This is US2783 on Rally.

Currently, to set up or maintain a broker, an administrator must edit
development.rb, Gemfile, and .rb files under
/var/www/openshift/broker/config/environments/plugin-config/.  This
situation presents two problems:

• An administrator must deal with Ruby and Gemfile syntax to configure
   the broker.

• The modification that the administrator performs is performed on files
  that we developers may change.  Consequently, we have two choices:

   • Mark these files as config files in the RPM .spec, and expect
     administrators to import developers' changes on upgrades.

   • Don't mark these files as config files, which means that we will
     overwrite administrators' changes on upgrades.

   Currently, we take the latter option, but both options are bad.

The patch changes the Ruby code to read from configuration files under
/etc/openshift.  Following are the changes.

• The patch modifies the OpenShift::Config class.  This class was already
  used for reading /etc/openshift/node.conf on the node, and it reads
  configuration files of a line-based, key=value format.

• OpenShift::Config is changed from a singleton class to a regular class.
  Instead of OpenShift::Config.instance, users should now use
  OpenShift::Config.new.

  An .instance method is implemented that just calls .new, so
  OpenShift::Config behaves like a singleton (it just lies about its
  uniqueness) for legacy code that hasn't been changed to use .new.

• Because it is used on both the broker and the node now, OpenShift::Config
  is moved from openshift-origin-node to openshift-origin-common.

• A user of OpenShift::Config can now pass the path of an alternative
  configuration file to OpenShift::Config.new.  This path is generated
  as follows:

   • plug-ins use

       File.join(OpenShift::Config::PLUGINS_DIR, 'foo.conf')

     to get

       '/etc/openshift/plugins.d/foo.conf';

   • other code uses

       File.join(OpenShift::Config::CONF_DIR, 'foo.conf')

     to get

       '/etc/openshift/foo.conf';

   • and for backwards compatibility with current users, the default if no
     argument is passed to .new is to read from '/etc/openshift/node.conf'.

• A plug-in "foo" is automatically enabled when the file
   /etc/openshift/plugins.d/foo.conf is present.

• The "foo" plug-in uses the OpenShift::Config to read values from this
  'foo.conf' file; the plug-in does this work in a Rails initializer.
Documentation updates

Remove references to hot deployment functionality, which is not
currently supported.
Merge pull request #645 from ironcladlou/node-hot-deploy-docs

Merged by openshift-bot
Merge pull request #635 from Miciah/etc-plugin-conf12

Merged by openshift-bot
Hook LFC up.
Changed example.
More succinct hci_filter
Add memory access and flash dump
tprintf: fix va_list arg exhaustion

If it is called a second time on vnsprintf, it can segfault.

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
Merge branch 'master' of git://github.com/markusa/netsniff-ng
Replaces the compiled version with a text-version

* Removes the .scpt (compiled) script because that's a binary, that's not readable online
* Adds the .applescript (text) script because that *is* readable online
Refactoring. Map shows up at start. Menu displays choices.
xx
prefarence
Revert "Jonathan Perry"

This reverts commit 57710c392f328bd2a84e00459b89d4066a70f8da.
Jonathan Perry

Eh, this is my forth commit today. I've implemented some design and
visual changes to the Add Review screen, Location, Check in, to name a
few. Outstanding to do is the User Follow and Venue screens, which I'll
complete tomorrow. It's starting to look quite good!
Beautifying the config write function to o/p the config file in beautiful format
Adding code to populate the database.

We are running the symfony command to generate the tables using php
system command.

TODO: Find a better solution.
restrict RIL removal to CM10 only
Renamed slide files.
Fixed images dimensions.
add link to googledoc spreadsheet to readme
IT WORKS! FINALLY
Yannick commit test
Getting ready for something new :)
add grml-zsh-config based theme

note that this file is under the GPLv2 as it is directly (almost
line-by-line) derived from the grml zsh configuration
add the rest of grml-zsh-config as a plugin

note that this file is under the GPLv2 as it is directly (almost
line-by-line) derived from the grml zsh configuration
Merge pull request #2 from matthiasr/grml

Grml
add Norwegian localization of general settings tab
keep trying to connect to mgmt itf for 15 seconds
fix GUI status if mgmt itf can't be reached
don't show status window on openvpn exit if silent
add Chinese (trad.) localization by Yi-Wen Cheng
use default sub-language for resources

This makes common controls display localized elements
gemfile plus finish problem 19
Merge branch 'master' of github.com:mattraibert/caspars
add unblacklist command
apps pa android
finish ch7 maybe"
Adjusted Missouri Valley's chat widget
Added MVC's chat  box
Added MVC's chat box
Updated the index dropdown
Added MVC's loc pdfs
Added the Teacher location map
Added the edition statement to UCM's bib_display
Fix type addChild instead of appendChild
Added Xcode project implementation
Committing due to fatal error between switching branches.
readParam changed to readParameters in hoomd potentials class.
Changed "readParam()" to "readParameters()" in some obsolete comments.
Fixed compiler warnings in DdMd (initialization order, unused variables).
Editing *.dox files.
'Ordering by index' for groups is included in configIo classes.
Editing *.dox files.
Merge branch 'master' of github.com:medapuram/simpatico

Conflicts:
	src/ddMd/configIos/DdMdOrderedConfigIo.cpp
Trivial changes made in DdMdOrderedConfigIo
Trivial change in DdMdOrderedConfigIo
Error check points included in DdMdOrderedConfigIo
Merge remote-tracking branch 'medapuram/upstream-devel' into devel
Adding notes on proposal to break up DdMd::Simulation
Changed local variable to class member (in ddMd/StructureFactor)
Changes to calculation of maximum structure factor.
Merge remote branch 'origin/upstream-devel' into upstream-devel
Changes to allow DdMd::Integrator::run to be invoked repeatedly.
Also added set and get functions to DdMd potential energies.
Fixed DdMd::timer to allow start/stop, added OUTPUT_DIAGNOSTICS ddSim command.
Merge branch 'devel' of git://github.com/dmorse/simpatico into upstream-devel

Conflicts:
	src/ddMd/diagnostics/StructureFactor.cpp
	src/ddMd/diagnostics/StructureFactorGrid.cpp
Editing documentation about commands, adding some notes.
Camera work good.
Removed old default file that got added as "git junk".
brew's vimpager is way more snappier
resetting vim-git
setup database for travis
Creado TP1
Removed "Input" class, fixed bug with Text class
Poor man's SQL parser
Add migration classes from old debt system
Restructured templates
Merge branch 'master' of github.com:micmmakarov/omgwant
Fixed test for listing operations

This fixes test 'Documentation should return complete list of operations when query collection documentation'
Merge pull request #8 from rh/operations-test

Fixed test for listing operations
readme improvements, version bump
Renamed EChatScope and ChatSubscription
Update confmanager.sh

Поправил содержимое .bash_profile
up display author
Merge branch 'master' of https://github.com/misteryyy/project-f
Validate that the name is not empty when adding watches
Don't send urlencoded with mootools adapter
create post menu change
Correct reference to template.Library
release 0.8.2

* Fix bug local variable 'auto_update_soa' referenced before assignment

Signed-off-by: Kouhei Maeda <mkouhei@palmtb.net>
Merge branch 'master' into devel
first test edits
Add support for different databases for cache fpcache and session
Remove verification for existing fpcache and session databases
Remove vhost from hosts.erb and hosts recipe
Merge pull request #15 from mlopes/feature/Separate-cache-and-fullpage-cache

Add support for different databases for cache fpcache and session
Merge pull request #16 from mlopes/feature/MISGD-382-Remove-vhost-from-hosts-file

Remove vhost from hosts.erb and hosts recipe
big changes may need a revert
逆序环视：输出替换前后的文本，以便对照
顺序环视：输出替换前后的文本，以便对照
不通过环视添加括号
Small changes on Directory & Solar notifiers scripts.
Employees Working at Home App # Add cocoon gem
 Employees Working at Home App # Add cocoon gem
 Employees Working at Home App # Add cocoon gem
 Employees Working at Home App # Add cocoon gem
names in comments
initial commit, template file
print search sql
fixed runMira
Added new content and a image to the site
changed tabbing
Merge remote-tracking branch 'origin/gh-pages'
Autoscaling and limits in mplot3d.

    * Fixes improper setting of x,y,z limits not turning off autoscaling
    * Adds units support to z-axis
    * Adds shared axis support for z-axis
    * Closes #783
A bit of cleanup
delaunay linear_interpolate_grid: enable grid of height/width 1
fixes #997
delaunay: test for 1d and 0d grids (fails upstream) re: issue #997
Merge branch 'iss997_test' into iss997_altfix
Update documentation of specgram

Mention that plotted data is in dB
check `ret is False` in Timer._on_timer

The docstring states:

> Functions can return False if they should not be called any more.

Cleanup commit 2f11dee changed this logic,
so any return value whose boolean interpretation is False (e.g. None)
would be unregistered.

fixes #1492
DOC: Update return value units in specgram
add comment to protect against future 'cleanup' of `if ret is False`
test_delaunay: avoid numbers in 1d test, use np.allclose
Merge branch 'iss997_test'
_delaunay.cpp: support [x0:x1:1j] grids even if x1!=x0
use ret == False instead of ret is False

per review
DOC: 'inout' option for tick_params direction

Thanks to Mike Kaufman for reporting it to mpl-devel list
Merge pull request #1503 from ivanov/doc-ticks-inout

DOC: 'inout' option for tick_params direction
DOC: fix function link in LassoSelector
Reorganize the developer docs.  Most importantly, this adds a pull request checklist.
Fix release guide
Update coding guide with suggestions from the PR.
Fix documentation formatting
Initial import
renamed README.md -> README
added wifi-calc.spec.in

added wifi-calc.spec.in to generate an rpm spec file
fixed upcase and removed @costume
update images to point to github source
Added tag FENNEC_18_0b4_RELEASE, FENNEC_18_0b4_BUILD2 for changeset a2ea3f2b1093
Added tag THUNDERBIRD_17_0esr_RELEASE, THUNDERBIRD_17_0esr_BUILD1 for changeset 6d154559e5c2
Added tag THUNDERBIRD_17_0_RELEASE, THUNDERBIRD_17_0_BUILD1 for changeset 38eb75f509f8
New module: fullstack
Rajout des subsections "Gestion de projet"," Méthode et outil", "Découpage du projet", "Organisation de l'équipe", "Gestion des risques" et "Mise en place de jalons" sur le fichier conduiteprojet.tex se trouvant dans le dossier chapters par Samuel Da Silva à 12h48 depuis l'ordinateur se trouvant au 15 rue de landegrand, 33290, Parempuyre, FRANCE, adresse IP 86.201.139.44
Android mvn initial
Allow use of custom WebViewClients
Added Search class. Effectively replacing KrakData functionality
Merge branch 'ModelRefactoring_01' into develop
Adding support for git completion for g alias.
Replace modules with services + hibernate and spring latest version
added
Nuevo commit de prueba
fix export audio sampleRate
fix #15474


git-svn-id: https://mscore.svn.sourceforge.net/svnroot/mscore/trunk@5627 e27ab94a-cc1d-0410-850c-f737b25541af
Wstepnie pod strona ListTodo łopotalogiczne naprawda tabPage na podstronie
dodany kalendarz (beta)

pierwsza wersja kalendarza, do zmiany:
1. "prompt('Event Title:')" najlepiej na reveal z fundation (odpowiednio
zmodyfikowane)
2. zmiana stylu

wymiana informaci chyba moze opierac sie na tablicy przechowywanej w js,
bo to tylko interfejs a nie gotowa aplikacja, ( za każdym razem będziemy
startowali od początku)
tiket:5 fixed note in comments
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
Add spec for the adding of headers to plain text bodies in attachments.
more additions to the gemfile
ignoring token file
Fix missing entry in debian/control

Add MIT and LGPL entry

Thanks to Laszlo
Bug 764901 - Robocop: make testPasswordEncrypt more robust; r=jmaher
Bug 781548 - Add WebAPI tess for resuming held calls, r=jgriffin, DONTBUILD because NPOTB
Bug 783282 followup fixes (bug 786593, bug 786406, bug 786291, bug 786495, bug 787895). a=lsblakk
Backout changeset e1edaf3a8883 (bug 744388); r=dao, a=lsblakk
Bug 764051 - Fix crasher when accessibility is turned off. r=blassey a=akeybl
Bug 736655 - Resize dmg window's background to fit Mountain Lion's new minimum size. r=gavin
Bug 792647 - Wait for system-message-listener-ready on B2G before returning during newSession, r=philikon
Bug 769960 - Refactor the terrifying code in nsSafebrowsingApplication.js.  r=fryn, f=gcp
Bug 778247: mAppContext cleanup: not needed for events. [r=mbrubeck]

--HG--
extra : rebase_source : d5dfd53953736117609fbe4acce2982f7888d4cf
Bug 778247: mAppContext cleanup: display metrics can be obtained from context. [r=mbrubeck]

--HG--
extra : rebase_source : a36329385979ffd0312fdba19b17798f0e62b3ad
Bug 778247: mAppContext cleanup: BrowserToolbar doesn't need it. [r=mbrubeck]

--HG--
extra : rebase_source : 9b4e36926beaaa29316a715443551b0fd324629c
Bug 778247: mAppContext cleanup: TabsPanel doesn't need it. [r=mbrubeck]

--HG--
extra : rebase_source : be08d9e04fd9e6f15e3d99915c532916afd5a093
Bug 778247: mAppContext cleanup: BrowserApp is a subclass of GeckoApp. [r=mbrubeck]

--HG--
extra : rebase_source : 4ae2582c26ad0e2fcd464fdceddffb80ea46c88e
Bug 778247: mAppContext cleanup: AboutHomeContent is associated with only one activity. [r=mbrubeck]

--HG--
extra : rebase_source : 60aa53488d18f395e4e4b6d0023e357ffcb23ee4
Bug 778247: mAppContext cleanup: Tabs can avoid it. [r=mbrubeck]

--HG--
extra : rebase_source : 1a5ed5ec5dbfdd72c81877196e3a3f10764e3d07
Bug 774671 - Fix mismatched declarations. r=luke.
Bug 816374 - Don't export RasterImage from imagelib. r=joe
Bug 746142 - Part 1 - Add inputmode attribute to HTMLInputElement. r=mounir sr=smaug
Bug 746142 - Part 2 - Use inputmode attribute to vary the virtual keyboard on Android. f=mounir r=cpeterson
Bug 785510 - Add accessible retreival service to utils, and remove it as global from modules. r=davidb
Bug 783077 - Attach accessfu to b2g shell. r=fabrice
Bug 779358 - Change click handler back to use capture. r=cjones
Backed out changeset 8f79f5a6b073 because the author name was missing in original patch
Back out bug 722034 and bug 746018 due to performance regression, a=josh, a=taras
Merge bug 722034 and bug 746018 backout, a=akeybl
Backout 00cc23d1f72b (bug 722859) for compilation failures
Bug 810260 - xul:deck hidden pages shouldn't be offscreen, r=tbsaunde
Bug 722859 - Support concurrent private/public downloads in the download manager. r=paolo/mak sr=bz ui-r=shorlander
Bug 755558 - report exceptions in head.js during browser-test.  r=gavin
Bug 762528 - Remove enablePrivilege from password manager tests. r=fryn
Bug 755841 - Close a cursor during database creation. r=cpeterson
Bug 764515 - When setting default browser in Windows 8, should also set non http defaults. r=jimm
Bug 813468 - [Apps] Unable to install packaged apps when running OOP;r=fabrice
Bug 813705 - Initialize nsresult value before possibly using it. r=roc
Bug 806591 - Add CommonUtils.generateUUID utility function; r=rnewman
Bug 807231 - Add CommonUtils.{getDatePref,setDatePref}; r=rnewman
Bug 803377 - Add CommonUtils.convertString; r=rnewman
Bug 718067 - Part 1: Create skeletons for services/{metrics,healthreport}; r=rnewman

services/metrics will hold generic metrics code. services/healthreport
report will build on top of that to provide the Firefox Health Report
feature. All functionality will land in subsequent patches.
Bug 718067 - Part 2: Define types for representing metrics data; r=rnewman
Bug 718067 - Part 3: Add MetricsCollector; r=rnewman
Bug 804491 - Data submission policy and scheduling driver for Firefox Health Report; r=rnewman
Bug 802914 - Implement Bagheera client and server; r=rnewman
Bug 810053 - Add explicit test for obsolete document deletion; r=rnewman
Bug 809930 - Make metrics provider collection API more robust; r=rnewman
Bug 809954 - Handle unexpected future dates; r=rnewman
Bug 810132 - Add remote deletion requests to policy; r=rnewman
Bug 808219 - Firefox Health Reporter service; r=rnewman
Bug 809644 - Health Report provider for application info; r=rnewman
Bug 811159 - Save last submitted health report to profile; r=rnewman
Bug 813226 - Add ability to bypass policy acceptance; r=rnewman

This is needed to support background "always OK" data submission, such
as ADU pings.
Bug 812377 - Health report provider for collecting system info; r=rnewman
Bug 718066 - Pref off FHR on all platforms. r=gps
Backout changeset f18c63c99be6 (bug 789257) for breaking the builds
Backout changeset 25fd2119c8e1 (bug 714937) for possible orange
Backout changeset 1bce26e37922 (bug 719180 part 1) for possible orange
Backout changeset 2a737ee5d9b1 (bug 719180 part 2) for possible orange
Bug 789308. Fix reversed socialFrameShow/Hide events. r=felipe
Bug 786207. Display name in share panel is white on gray on OSX. r=felipe
Bug 789248. Fix failing social tests by only updating the status panel on tests that require it and are sure to clear it up afterwards. r=felipe
Bug 787272. Disable recommend button on logout. r=jaws
Bug 766616. Part 1. Implement about:socialerror page. r=mixedpuppy
Bug 714937 - Replace GFX_PACKED_PIXEL with an inline function. r=jrmuizel
Fix erroneous spill slots being added to safepoints (bug 757785, r=jandem).
Automated checkin: version bump for firefox 14.0b7 release. DONTBUILD CLOSED TREE a=release

--HG--
branch : GECKO140_2012061216_RELBRANCH
Added FIREFOX_14_0b7_RELEASE FIREFOX_14_0b7_BUILD1 tag(s) for changeset 1cbedcda8204. DONTBUILD CLOSED TREE a=release

--HG--
branch : GECKO140_2012061216_RELBRANCH
Backed out changeset dcb9299974a0 due to audio issues on android and b2g

--HG--
extra : rebase_source : 7e2b937487c3df9a40406eadf250e6596b89664f
Backup bug 775319 due to audio issues on android and b2g

--HG--
extra : rebase_source : 0ffcd6094a9843a6045ab345025e9e8252fa5018
Bug 776328 - Only create holders for WNs. r=mrbkap
Bug 779269 - Implement a TryMerge method for nsDisplayFixedPosition. r=roc

Allow nsDisplayFixedPosition items that share the same fixed-pos frame to be
merged. This avoids a bug where the Google PDF viewer document image gets
re-rendered offset on the initial frame of a scroll when layer acceleration is
enabled.
Bug fix for sign of inserted chao1nums. Bug fix for TJ average.
There is *one* coach with an ilkid of length 10. (#4)
Rake task to import the coaches. (#4)
Importing the players (#4).
A simple view listing all the (lonely) people. (#8)
channels for games and some html
ver.1.0 (utf-8)
プレハブの構成を整理。
敵、魚雷作成。スクリプトはこれから。
ソナーデバッグ用位置オブジェクト
Add app preview image to README
add show for Programs
Added fast type checks to chai
Improve defaults in chai
Added notok snippet to chai
Towards a single page application...
Merge branch 'develop' of github.com:neontribe/ToiletMap into develop
Unified
cherry-picked parts of
b0f368b10ed91e336076516187a4d521784b4efd
cmake: fix install path, add RPATH configuration

Conflicts:
	CMakeLists.txt
cherry-pick 65e51b9bbfeb750670e327109b2aa0a72a19f57

cleaned up conflicts, reduced to just RPATH changes

cmake: fix RPATH configuration

Conflicts:
	CMakeLists.txt
Merge branch 'stable-rpath-mine' of https://github.com/nereocystis/FreeRDP into stable-rpath
add job efficiency
Improved: refactored analysis - validation - captcha - validation flow.  Mimics now closer to Drupal Mollom. Uses checkContent() update capabilities when passing contentId instead of keeping all data client-side.
una muestra mas
Added Hawaii to voter ID map--my bad
Added clearfix to embed content area
Added marijuana and health care ballot issues to other_votes
Merge branch 'master' of github.com:newshour/map_center
added more vector operations and added controls somehow
Can't iterate over a defered
Finished UploadFile nad ProjectFile servlets and views.
Update components/com_content/models/form.php

produce URL-safe code which won't be changed by JRoute in case of some utf-8 language chars (e.g., Greek) in menu aliases
Removing unused shortcuts and adding better buffer navigation

ALT+arrow
Removing auto save on vimrc
Add some timezones tools
Use human readble catalog field name when possible #
csv, table: add method reindex_record
Don't check for a specific exception from list.index.
dont know what the fuck i am doing
enable parallel builds
Build-Depend on dh-autoreconf
Demongoozify some models
Remove toLocaleDateString() calls
Update load user filter priority
cpp: { 177 : "d1" }
Update .gitignore for CPP
Changing the item/list to items/list
Update media/jui/js/bootstrap.js
Typecasted null variable as array for foreach loop

PHP (not sure starting which version) would give the following error:

A PHP Error was encountered

Severity: Warning

Message: Invalid argument supplied for foreach()

Filename: loopee/pi.loopee.php

Line Number: 219
discussion: Fix figure reference

Signed-off-by: Niels Thykier <niels@thykier.net>
adding in the old code
NXP-7109 re-enabled fixed test (was injecting wrong manifest in test jars)
NXP-9249 fixed chained pattern initialization
NXP-9255 don't install non bundle files at startup

Conflicts:

	nuxeo-runtime-osgi/src/main/java/org/nuxeo/osgi/application/loader/FrameworkLoader.java
Channel: Prevent @iban from adding wildcard when an exact banmask is given.
Add support for extended banmasks. Closes GH-105.
Prevent NameError if ssl module can't be imported.
Socket: Use select.select() instead of checking sockets one by one. Closes GH-431. Closes GH-420.
Remove debug output.
Add context() method to registry.Value objects. Closes GH-430.

This method returns a context objet, for use with the 'with' statement.
Channel: Make use of the context() method of registry.Value objects.
Add registry.Json.
Add editable() method to registry.Json.
Cas is deserialized with getBlobAsBytes instead of
getBlobAsBinaryStream, and then a ByteArrayInputStream turns it into the
a stream, in order to work with sqlite jdbc driver #3
Arch defaults to none.
Merge branch 'master' of https://github.com/ocaml-bytes/ocamlcc

Conflicts:
	dist/ocamlcc-1.0.tar.bz2
Re-generate dist
giving up on data push
Add chinese documentation
Merge remote-tracking branch 'origin/master'
Fix creating and viewing Persons
Small improvement in test layout
Encapsulated code generation
renamed Validator to ValidatorImpl; implemented some specs; replaced
util.* package with Utils class
avsys add
Fix template for stable url
Optimise the generation of timetables
Added the ability to long press on products to select them
project file that needs committed
Fixed deselecting products during multi-select, deselecting all selects "All"
fixed the deselecting of "All Apps"
Fixed auto-filling of vendor ID (+ better error message if it fails)
Merge branch 'master' of https://github.com/syko9000/AppSales-Mobile into syko9000-master
Code formatting changes
Slightly changed product selection behavior

- Long press is now recognized before the finger is lifted (when the gesture
  begins, not when it ends)
- Tapping an already selected product always makes it the exclusive selection
  instead of deselecting it
- Long-pressing an already selected product deselects it
- add string helper
- remove wrong i18 file
update iPad version
add string helper
add line break in too long filenames.
select image with dialog (easyDb dialog)
style dialog
fixing async
Fixed NPE when grouping columns with non-output components
Merge remote-tracking branch 'origin/master'
Fixed focusing in TabbedPane when mirrorTabSetVisible is true
Fixed auto growth in inputTextArea when height is set in CSS.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'remotes/origin/master' into 3.0-master
Fixed setter name for mirrorTabSetVisible in TabbedPane (jsp tag)
Merge remote-tracking branch 'remotes/origin/master' into 3.0-master