labofsahil/github-event-dataset-2012 huggingface dataset:
Merge Commit
Merge commit '5dd9cc9633b81ac42a2b2cf0900b386e6c712801'

Conflicts:
	Game/Game/PlanexTD/PlanexTD/Base.cs
Kameras und Lichter Überarbeitet
Merge commit 'fbb67f8c68862d53dc4d7ec1596d699f937e6991'

Conflicts:
	Game/Game/PlanexTD/PlanexTD/Game1.cs
Kamera und Lichter
Merge commit '99d5bc3a709ad0ff8b4b8e7d1e1af02f6bbc864b'

Conflicts:
	Game/Game/PlanexTD/PlanexTD/Game1.cs
Merge commit
Merge commit '43cf6536934622fb87caff18903d23ea650eb8f5'

Conflicts:
	Game/Game/PlanexTD/PlanexTD/Game1.cs
Kamera und Lichter gefixed. FreeCamera ist immernoch verbuggt und wird es auch bleiben, es sei denn sie wird separat nochmal implementiert.
fixing setup.py
updating gitignore
Removed some unnecessary spaces. Added an extra exception on
eventlistener.
Merge branch 'master' of git@github.com:Z-app/zmote.git
Add dependencies to setup install_requires

Allows setuptools to resolve the dependency chain if APAF is
itself a dependency of a project.
Remove hard dependencies from the config file

Modifies apaf/config.py so that it may be imported before any
dependencies have been installed, e.g. when installing apaf.
Test!
Merge pull request #1 from cannjeff/master

I tested it, it looks ok to me.
Update links to point to the new flasc webpage
Added layer system.

Now maps are divided by layers. There should be a ground layer, upper
ground layer (sand, for instance) and a collision layer. Still not sure
how to handle different types of objects (i.e. should a static fence be
added as a layer map or as an individual object?). TODO: add different
types of static, non functional objects (props) and a moving character.
Add team slide
UPNP - Sort TB Shows by Episode, else sort by Label
Use CGUIViewState for ordering of UPNP Containers
Merge branch 'master' of https://github.com/akelge/xbmc
add SHEF codes to database and to sites app
link a las condiciones de uso #55
Merge branch 'master' of github.com:alabs/15mcc
theme accenture ptj
Merge branch 'issue529' into 1.4.x
[maven-release-plugin] prepare release wro4j-parent-1.4.9
update logging level for tests to INFO
improve lessCss reporting
improve json message reported when rhino fails
fix failing unit test
fix merge conflicts
Merge branch 'issue554' into 1.4.x
remove unused file
Merge branch '1.4.x' into 1.5.x
Updated bootstrap-sass and simple_form gems
Make the event icons on the home page white
porting _env test from master
porting double baking test case from master
Merge remote branch 'origin/rewrite_popen' into rewrite_popen
porting some changes to rewrite_popen
source/base: base source rupture-site distance filtering uses jb dist
Merge pull request #53 from angri/faults-rupture-site-filter

[r=al-maisan,dmonelli][f=1036243]
Base source rupture-site distance filtering uses Joyner-Boore distance
Merge branch 'master' into c-ext4
geo/mesh: better comment in get_joyner_boore_distance()
Created CopyHandler.
testing to commit
added hello.txt
Update data/win/launch/launch.cpp

Changes the working directory to the location of the exe file
Fixes: https://github.com/appjs/appjs/issues/188
Merge pull request #189 from mondayx/patch-1

Update data/win/launch/launch.cpp
sunxi: video: disp: fix build warning

drivers/video/sunxi/disp/dev_disp.c:1686: warning: 'state.event' may be used uninitialized in this function
sunxi: nand: fix build warnings

drivers/block/sunxi_nand/nfd/nand_blk.c: In function 'init_blklayer':
drivers/block/sunxi_nand/nfd/nand_blk.c:1333: warning: unused variable 'cmu_clk'
drivers/block/sunxi_nand/nfd/nand_blk.c: At top level:
drivers/block/sunxi_nand/nfd/nand_blk.c:120: warning: 'ahb_nand_clk' defined but not used
drivers/block/sunxi_nand/nfd/nand_blk.c:121: warning: 'mod_nand_clk' defined but not used
sched: remove useless export

This is a partial revert of commit 67aaa26dab7f7345864e774ffc3be382218f1090.
- this export is unneeded since Smartass version 2.
- it is misplaced: it shouldn't be added at the end of the file but at the end of the corresponding function (through this doesn't trigger any compilation error).

Signed-off-by: adridu59 <adri-from-59@hotmail.fr>
video: sunxi-disp: import-sun5i and make things compile on sun4i
mali: Update Mali kernel driver to r3p0
mali: Fix CM inline build and O= usage
ump: fix build error with parallel make

Some UMP components expect the Mali module to be built already,
so we should add a dependency to indicate it. Otherwise build
fails with missing files.
video: sunxi-disp: find new ump headers
Merge remote-tracking branch 'sunxi/stage/sunxi-3.0' into work-3.0
root finding sources
added root finding sources
require.async reg

修复正则
popover arrow color
Scrolling to correct elements working, navigation highlighting working, page links working in conjuncion with page position
* fixed typo in texture filtering setting
added commenting to figure out bug
added baseline connection manager with openings for adapters
Fix a NPE in Arena.get(Player)
Fix permissions & split StageCommand and rename stuffs
Fix Joinstage broadcast permission
Fix "/dac list" messages
Bump to 0.8.0 (alpha version) & clean up pom.xml a bit
First step for XBMC Notification
Push Version
Added nsime_udp_protocol_state record
Added nsime_udp_echo_client_state record

Changed return value of nsime_simulator:schedule.
The return value is now a nsime_event record. It
was previously a nsime_time record. This will
enable easier cancellations when there are
simultaneous events.
Added nsime_udp_echo_server_state record
Changed socket type to pid() in nsime_udp_echo_client_state/server_state
Added nsime_udp_echo_client (not tested)
Added nsime_udp_echo_server (not tested)
Added GNU GPLv3 to all files
Added nsime_ip_endpoint (not tested)
Added nsime_ip_endpoint_demux_state record
Added nsime_ipv4_address and nsime_ipv4_mask (not tested)
Added nsime_ipv4_interface_address (not tested)
Added nsime_ipv4_interface_state record

This commit also has incomplete implementations
of nsime_ipv4_interface and nsime_ip_endpoint_demux.
Added nsime_netdevice (not tested)

This commit also modifies nsime_ptp_netdevice
to handle all gen_server:calls from nsime_netdevice.
It also has a few bug fixes in nsime_ipv4_address
and nsime_ipv4_mask (Note to self: Compile before commit!)
Added nsime_ptp_netdevice:send

This will enable nsime_netdevice:send to
reach a nsime_ptp_netdevice via the PID.
Added nsime_ipv4_interface (not tested)
Added nsime_ipv4_interface:get_address_list
Commit of intermediate code for nsime_ip_endpoint_demux:lookup
Completed nsime_ip_endpoint_demux (not tested)
Changed nsime_drop_tail_queue to nsime_droptail_queue
Added nsime_udp_socket_state
v0.0.2 ?
imap: Code tidy up prior to adding support for the CAPABILITY command

* Changing the order of the state machine to represent the order in
  which commands are sent to the server.

* Reworking the imap_endofresp() function as the FETCH response doesn't
  include the command id and shouldn't be part of the length comparison
  that takes into account the id string.
fix syntax error in grains.core.id_
added preliminary unit tests for rvm module
remove unused imports, Fix #1189
Merge pull request #1190 from baijum/unused_imports

remove unused imports, Fix #1189
Module for package management with Homebrew on OS X
added proper unit tests for gem and rvm modules and states; fixed bugs in the rvm module's install function and in the rvm state's handling of ruby versions
add X-Python-Version to debian/control file
Merge pull request #1192 from msabramo/osx-brew

Module for package management with Homebrew on OS X
Merge pull request #1195 from kadel/develop

add X-Python-Version to debian/control file
Allow network.ipaddr to be called with no args
Support for managing services on MacOS using launchctl

Sample usage:

$ sudo salt 'SCML-MarcA.local' service.status homebrew.mxcl.mongodb marca
{'SCML-MarcA.local': True}
$ sudo salt 'SCML-MarcA.local' service.stop homebrew.mxcl.mongodb marca
{'SCML-MarcA.local': ''}
$ sudo salt 'SCML-MarcA.local' service.status homebrew.mxcl.mongodb marca
{'SCML-MarcA.local': False}
$ sudo salt 'SCML-MarcA.local' service.start homebrew.mxcl.mongodb marca
{'SCML-MarcA.local': ''}
$ sudo salt 'SCML-MarcA.local' service.status homebrew.mxcl.mongodb marca
{'SCML-MarcA.local': True}
Merge pull request #1196 from msabramo/network.ipaddr-with-no-args

Allow network.ipaddr to be called with no args
Merge pull request #1197 from msabramo/launchctl

Support for managing services on MacOS using launchctl
Add commands: list_upgrades, upgrade_available
Make the output of brew.install more like yumpkg.install
Merge pull request #1200 from msabramo/brew

Make `brew` module conform better to the `pkg` interface
Merge pull request #1194 from mnemonikk/add-tests-to-rvm-module

Add tests to rvm and gem module and state
Added roleassign module.
more complete checkchange support
Change escriptize archive permissions to a+x

By default, executables in paths such as /bin and /usr/local/bin have
the mode saying they can be executed by all.

The current version of escriptized archive only sets u+x , which creates
problems when copied directly in repositories and requiring other
programs to interact with them.

This change makes rebar follow the standard of linuxes and unixes by
setting the permission flag to a+x, allowing users, the group and others
to execute it.
Add Fred Hebert to THANKS file
a simple commit

This is a longer verison
of
the
message
Changed Event's handlers to a list (from unordered set) so that events fire in the order that they were subscribed
Removed some superfluous prints
Made libpirc a directory-module and split classes each into their own file
added SimpleDateFormat in velocity context in the metadata tool
Fixes #4456: Filter more IDEs/OS junk in .gitignore
fixed: group icon fallback error
Amends #4456: Each section should get a comment
Fixes #4509: Remove invalid space in id attribute markup
Fixes #4507. Corrected typo for twitter interstitial page.
Fixes #2936. PDFs are downloaded "inline" (in the same navigator).
Updated changes.
Fixes #4372. Using elgg_view_friendly_time() in river entries.
Documented that results will be null if no results are returned in ElggBatch.
Documented that elgg_delete_metadata/annotations() returns null for no ops.
Refs #2776. Cleaned up ElggEntity::setMetaData().
Fixes #2776. Overriding permissions to delete metadata when overwriting multiple values.
Refs #4487. Turning off system log (even more) during upgrades. Removed debug call to system_log() in create_annotation().
Fixes #4512. Passing inc_offset only for deleting / disabling callbacks in metastring functions.
Updated changes.
Fixed typo for admin notice about plugins not being loaded because of mod/disabled
Fixes possible XSS vector.
Updated CHANGES.txt.
Setting the useradd action's access to admin instead of public.
Only caching access lists after ready, system fires.

This prevents a bug where access lists could be cached
and not cleared during plugin boot while access was disabled,
which could expose entities set to ACCESS_PRIVATE.
装備メモ他
Implemented hash functions for floating-point numbers.
Implemented missing external constructors for boundary operators and operator ids
for Helmholtz and modified-Helmholtz operators.

In addition, the declaration of Laplace3dBoundaryOperatorId has been moved
to laplace_3d_boundary_operator_base_imp.hpp.
3DSOLID: moved unused variables into Doxygen comment.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>
HATCH: corrections.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>
parse ASCII code * in wildcard domain. Fixes #1093
Експерименти с тестването
Тестов фреймуърк: метод за "приблизително" сравнение на масиви
Корекции по `UserInboxPlg`
blast_Emails - fixed #347
all - mac osx port bug fix
form validation configs
Onwards to prod!
source tools
Added preliminary tests, GPL license, and (stub) setup.py.
debug messages

Signed-off-by: bovitobo <bovitobo@yahoo.com>
update download action
add social media buttons to front page
almost finished first round
adding new debian packaging files
added mootools files
ditch old bootstrap, using twitter bootstrap.
Move naming scheme to boards (in line with Plyboard) closes #1
Doing some feature detection
migrate from laptop1 to tjpc
Added mobilizejs 0.9
Added joJS 0.4.1
Added Zepto 1.0 and updated package.json
Added xuiJS 2.3.2 and fixed package.json
fixed package.json package names
Merge pull request #261 from Xanza/master

Added Mobile Friendly Frameworks
First skeleton of the demo web site
Change `main` to ./lib/chai. Fixes #28.
if_up
修正上次修改引入的不指定-e就无法查看-T的bug
avoid infinite loops
gfm code hr list test
def_block test
add tests for #100.
added constructors to Utilisateur and offre with parameter (int id)
initial server build
releasing conductor 1.0.0
changed configuration settings
Fix small style bug in Scoreboard.js (part of the client of RWS)

The active sort column wasn't correctly styled when the Scoreboard was
initialized. It was only set after a re-sort.
Be more standard-compliant in DataStore.js (part of the client of RWS)

The addEventListener method on EventTarget object requires a third
boolean parameter, useCapture. Newer specifications are making this
optional, it doesn't even make sense for EventSource and I couldn't
find any browser in which this parameter was actually required... yet,
I'm adding it to be more standard compliant.
Show a proper message if an error occurs during the init of RWS client
Avoid using the @catch_exceptions handler (only in CWS, for now)

Tornado's RequestHandler has its builtin exception handling system:
._execute() runs .prepare(), .get(), .post(), .finish(), etc. inside a
'try' block, which calls ._handle_request_exception() if an exception is
raised. This, in turn, calls .send_error() with the proper error code
(500, if the exception isn't an HTTPError) and info about the exception.
.send_error() will then call .write_error(), which is intended to be
overridden by subclasses.

Thus, we can use .write_error() to do what we used @catch_exceptions
for. We can also easily render a custom error HTML page. (Note: this
page will only work for request handled by our handlers, i.e. not for
"generic" 404 error or 404 errors on static files.)

Minor drawback: if a non-HTTPError exception is raised we'll get two
messages in the logs, one by ._handle_request_exception() and one by our
.write_error(). It seems that our one is just a "subset" of Tornado's
(provided that we use a good logger). We could rely only on Tornado's...
Make statatement filename depend on language
Fix small bug in AWS

This prevented the creation of new tasks. Caused probably by a
copy-and-paste.
Fix the UserTest interface in CWS
fixed backward config-file compatibility with kenlm
bugfix: missing function call in name
added Hadoop files to remove dependence in glue grammar creation step
updated glue_owner so rules in glue grammar are scored
Fix compile error related to SRI-LM removal
git status now correctly  ignores .o files and executables
Merge pull request #7 from alopez/6a92a535adf8b9343c073fb47c3e5574bac96690

compile error fix (see commit history)
Fixes a couple of pipeline script bugs.

-Corrects bad classpath invocation in step [glue-tune]
-Inserts correct value of JAVA_HOME into hadoop config
 for automatically rolled out hadoop.
Fixes bug in test script
Git correctly ignores test files
Merge pull request #8 from alopez/master

Bug fixes for pipeline script and its test script
Locking on vocabulary lookup
Push kenlm updates.
- Left state handling (but it isn't used by Joshua yet)
- Binary file format change to use real probabilities instead of blank markers when SRI omits B C D E but has A B C D E
- Split trie building into two separate files
- Centralize some file handling routines
Forgot sized_iterator.  Also update left state to catch a corner case.
Actually compile ngram_query
Fix Trie's bound on vocabulary ids
Merge pull request #11 from kpu/master

Updated KenLM
bugfix: was printing blank line after failed translation
fixed tree visualizer example
added tree-visualizer script and an example in the examples directory
uninstall app
Add name for each photo
Correctly determine whether the version 3 update is required
Merge pull request #4110 from xchs/pull_request_2012-03-25_01
+ ‘Project3/core.1993’
- ‘lab1/report.pdf’
+ ‘Project/NetS3/NetS3/NetS3/testmain_backup.cpp’
fixed bug in extend list order because of async widget initialization while transfering widgets' state from node to browser. This bug sometimes caused not to work page switching on client-side in Safari
refactoring: moved Context class to the separate file
removed @DEFFERED special value constant in favour to ':deferred' "kind-of-ruby-symbol-value"
refactoring: widgetRepo is not more singleton on the server-side. It is now initialized per every request and garbage collected on request finish.
fast-fix of added bug in previous commit
fixed bug with freezing server-side rendering on second call when using widgetInitializer plugin
little refactoring: removed code duplication in "widget" templater plugin
lbdb_pull: do not pull not-full-names

Signed-off-by: Emilio G. Cota <cota@braap.org>
check for same array make stds mlags succicnt
Add support for IF gain.
add ssh module written by Zeth
Hub events now working, and syncAfterJoin and syncDataDirectly also working.  Updated unit tests to use relative paths, and to account for next-turn semantics in Hub's queueEvent
Improve async event dispatch
Remove unneeded return
fix test harness bug and remove console.log()
define no longer fails when defining non-anonymous main modules
added test for non-anonymous main module
update version, pacakge.json, readme, and dist to 0.7.1
added test to verify that curl no longer uses path information to test module id uniqueness
refactor to separate module id transforms from url/path transforms
record TODO items in curl/debug
remove old mock console
updated test case to reflect current logic
fixed problem when naked dots ("..") as a module id leaves trailing slash
restore suffixes/options in normalize()
marked test as "TODO"
no longer adds an extra char to end of resource ids that don't have suffixes/options
no longer fails to resolve plugin id when resource id looks like an absolute url
enforce default extension after resolving url to allow plugin-specific config to be consistent with dependency. both either have extension or not
update test to latest behavior
fix logic to remove leading zeros and process main modules vs plugins
added tests for package-main/plugin combo (like wire.js)
created dist versions
define no longer fails when defining non-anonymous main modules
removed outdated comment about i18n plugin
port latr/poll to when
Merge pull request #83 from scothis/poll

Port latr/poll to when
easygrep
done merge
Initial commit
too late to be creative
Added settings.ini to .gitignore
Merge remote-tracking branch 'origin/julianduque'
Give more info when creating customers
Add initializers to enable the rack parser
Change the tag line to make it clear.
Merge remote-tracking branch 'origin/julianduque'
Merge remote-tracking branch 'origin/julianduque' into senekis
Move font awesome to vendor/bootstrap/
addind welcome for providers

Signed-off-by: Juliana Dávila R <gobolindo@gmail.com>
Merge remote-tracking branch 'origin/master' into juliana
Fix send customer params to controller

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
Change font for the dashboard app
Merge remote-tracking branch 'origin/senekis'
Merge remote-tracking branch 'origin/master' into senekis
Merge remote-tracking branch 'origin/senekis'
Add geoip gem and get city with request.ip

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
Adding customers index view
Remove customer model from client directory

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
Merge remote-tracking branch 'origin/julianduque' into senekis

Conflicts:
	Gemfile
Add data and initializer of geoip

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
Paginate customers
add custom hub commands to improved help text
rewrite `alias` tests as cukes
v1.10.0
introducing sidebars
Merge pull request #2 from achamian/sidebars

Sidebars
Starting to integrate Ast with Yilei.
function, still broken
broken function needs to fix
update irb rc
update bashrc for new homebrew setup
main method now optionally takes command line arguments
Merge branch 'release/0.5'
Merge branch 'release/0.5.1'
Automatically add 2d index
Merge branch 'hotfix/0.5.2' into develop
updated gems
edit button for itinerary's owner in itinerary show
showing search only to logged in users
Merge branch 'release/0.6' into develop
Merge branch 'hotfix/0.6.1' into develop
Merge branch 'hotfix/0.6.2' into develop
DRYed user find
fixed and improved references index and show. added roles.
improved user timeline validation, fixed css focus
- Updated gems
- Added styleguides to README
- Applying ruby styleguide to controllers
- Fixed validation bug in user.rb
- Applying ruby styleguide to helpers
Fixed fontawesome paths.
Updated application.js and application layout to work with turbo links 0.6.1
Removed dropdown fix for bootstrap 2.2.1
Applying styleguide to javascript assets
applying styleguide
Revert "G2 hack to just force humanoid name"

This reverts commit df19e71b4e48b959c8b1135419b19df7f8a4acb2.
Increase workqueue retry time to 1 day.

Previously would only retry failed queueings for 1 hour.

Signed-off-by: stuartw <stuart.wakefield@gmail.com>
aumentato lo spazio tra le parole
an opportunity to use the quadratic formula again. Mrs. Buchanan would be proud.
/ ‘application/logs/log-2012-08-22.php’
/ ‘application/models/api/api_users_model.php’
[SIGAR-224] report 'nfs4' file system mounts as type network
Merge branch 'sigar-1.6'
escape colon in process ObjectName
fix invalid who.user assertion on win32
(SIGAR-226) fix missing *.cpp files from source archive
(SIGAR-227) fix to prevent missing file(s) from aborting add operation prematurely
Merge branch 'sigar-1.6'
Add loadavg to Python bindings.
Add proc_list to Python bindings.
[SIGAR-228] increase buflen for gethostbyname_r
Merge branch 'sigar-1.6'
Patch to allow mingw32 compilation
- Update list network interfaces win32 variant

  Some utilities such as netsh require a friendly name when doing
  any administrative tasks such as stop/start network interfaces.
  Currently sigar list network interfaces as 'ethX, lo, laX'. This
  is fine for read only purposes but in order to make further use
  of the network interfaces on windows we need a friendlyname or at
  least the interface description.
fixes to compile on MSVC again
don't use sigar->ifconf_buf in sigar_get_adapters_addresses
untabify/style
use stack buffer instead of heap for sigar_net_interface_name_get
SIGAR_NETIF_NAME_SHORT=1 env var will use the old eth%d names in sigar_net_interface_list_get
unify DLLMOD_ macros for ms and gnu
[SIGAR-230] bump windows proc_args max to 16k
prep for release 0.0.14
major changes after presentation !
new test
new test
new test
new test
Première version d'implémentation du réseau de neurones
Move to a generalized VERIFY stage in compilation to catch early syntax errors
not picked up by the parser (obj-literals, mostly).

Let eval in non-strict work as you might think it should.
Add parser for RegExp
Create DynRegExp
Remove extra parsing for global matching
Rename methods
Simplify flags checking
Hook up statement with CodeBlock
Refactor DynRegExp to follow the spec
Move DynRegExp to properties
Merge remote-tracking branch 'jingweno/regex'
Date.prototype.setMonth() implementation
Date.prototype.setUTCMonth() implementation
Export lists and tables
Minor change to trigger build on appharbor
lights added
Merge branch 'master' of github.com:edge87/PBCx
implement more movement commands; need to fix *until functions
add target clear method before checkout,check,sync
.travis.yml: Duh. Use sudo
Internal: Comment typo fix
Dropped the Expr Monoid because it was causing Travis to flake out.
test fixes
Spot penumbra; documentation; minor amendments.
ranking.addResult added
makes logger identify itself by module name
Moved apply code from Mirror to Reflect
Remove depedency on hoe and use bundler for gem release raketastic stuff.  Add test task.
Weird typo in sample
Jave native exception no longer standard exception
Bump for next version
Fixes https://github.com/enebo/jmxjr/issues/7 by mangling name (patch by 7er)
Ignore action
Global RMI never unregistered...madness
Browser app: move setBookmarksShowing to rendered since resized triggers
fittable reflow and it needs to know the size.
Add nth-omega and remove-nth-omega shortcuts
Add files config Delayed Job
Merge branch 'master' of github.com:mikebrock/errai
update web.xml and ErraiService.properties to add needed config and remove unneeded config
Fixed up JBoss AS 7 deployment for JPA Basic demo
use aliased subjects on bus instead of passing everything through the client dispatcher to allow clients to opt-out of receiving broadcasts they're uninterested in.
removed tons of logic and clarified roles.  Moved old "modules" into a new form called "contentStream".  Added object.create shim and separated gestures to global location.
add forms.less & fixed encodes problems
merge forms.less
update calendar&&starrating&&dropdown
cleaned up s3. ready to merge (#264).
Fixed "War Against Youth".
UI-1988 [PLF 4] Content Administration redesign - change some icon in accordion menu in ecmadmin
ECMS-4141 fix progress bar problem
ECMS-3661 close session after use
UI-1977: [PLF4] Wiki - header improvemnt
add numbers alg
Add 'sanitize' option for grains module
Tweak sanitizer to work with serials of any length
Fix a silly mistake I missed in a previous commit
Ensure only actual values are added to the mysql config option [GH-2467]
Merge pull request #2534 from fatbox/GH-2467

Ensure only actual values are added to the mysql config option [GH-2467]
Allow for the default to specified for config.option
Merge pull request #2535 from fatbox/GH-2467

Allow for the default to specified for config.option
Strip the word 'Linux' for os grain
Merge pull request #2538 from FireHost/fix_os_grain_map

Strip the word 'Linux' for os grain
Move the state.py module components into cmd

Than change here is to make cmd.{run,wait,script,etc} accept an argument
called stateful, and then it runs the commands using the stateful
approach debfined by @kjkuan
Amend #2538 to handle whitespace better
Use case-insensitive regex for linux strip
Remove unecessary call to re.escape()
Merge pull request #2539 from FireHost/strip_spaces_os_grain

Amend #2538 to handle whitespace better
Update jinja template unit tests and remove obsolete salt.utils.jinja.get_template().
Merge branch 'develop' of github.com:saltstack/salt into develop
Add missing import
Merge pull request #2541 from UtahDave/fix_client

Fixes #2540 Add missing import
_error function was missing from file ex module
set worker threads to 1 for testing

Travis CI is failing on python 2.6
Trying to lower total memory consumption so the tests
will pass
Error on case-wheres instead of ignoring them.
Fixed bytecompilation.
fix private-dbus finish
fix building on bsd
memory dao, factory, properties
Changed README to get rid of some rst-bugs.
added scoring settings as flags to get-weighted-vectors
Facebook Connect Implementation
Merge branch 'development'
Downcased some stuff in readme.
Move contacts() to PR & use for 'Personal Data' too
add prog object
add prog and inst object
Remove unused code
Refactored the edit bone calculation.
Refactored the bone creation and placement process.
Scaling done in the bone rest positions gets now applied to the imported model.
Fix errors when importing a Colossus.
Update some language keys related to the registration page.

Related to #702.
Display errors properly on the registration page.
Remove unused namespace import.
Added resize handle extra parameter
add platform for Lua testsuite
add GraphLivraisons.java
Merge branch 'master' of https://github.com/fspot/devoo
j'ai transféré GraphLivraions de model_prj dan supervision
j'ai transféré GraphLivraions de model_prj dan supervision
Merge branch 'master' of https://github.com/fspot/devoo
ajout du cas où un schedule n'a pas de livraison
Merge branch 'master' of https://github.com/fspot/devoo
don't preload unicorn
[0.83] correct sql-error post 28133

git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.83-bugfixes@17902 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.83] fix dico


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.83-bugfixes@18047 35612d4c-9d10-0410-837c-bf9dd1be60d7
work for #3717 contact supplier


git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@19223 35612d4c-9d10-0410-837c-bf9dd1be60d7
mising file for #3717


git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@19224 35612d4c-9d10-0410-837c-bf9dd1be60d7
missing file for #3717


git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@19225 35612d4c-9d10-0410-837c-bf9dd1be60d7
Hide footer on Mobile views
Finished basic implementation of snake.
Bump the patch version, update history.
Add some documentation to PG::Result#fnumber (fixes #139)
Updating the History file
Added signature for changeset 52d22b060501
Added tag v0.14.1 for changeset 2d83ce956f97
Fix the documentation for Result#check (refs #123)
Follow refactoring of TyClDecl/HsTyDefn
Merge branch 'master' of http://darcs.haskell.org//haddock
More changes renamed variables internally
Typo fixed.
Video grabsize is equal to the video window size.
Video windows with overrideredirect are placed under TCL windows.
A new activity has been created: Tele-Meeting-1280.
It is a TeleMeeting with two changes:
 o Screen size = 1280x960
 o Video windows created with overrideredirect, and placed under the tcl windows.
-[CALayer contentsScale] is 10.7+
Tweak render params
Set colors for backgrounds.
net/http: fix text for ErrBodyReadAfterClose

Can happen in both request and response.
Also use it in one place that wasn't.

Fixes issue 3997.

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/6903057
net/rpc: document that Register logs to standard error
Also fix spurious & in example.

Fixes issue 4349.
Fixes issue 4489.

R=golang-dev, adg
CC=golang-dev
https://codereview.appspot.com/6905058
encoding/xml: fix typo in Marshal documentation

Fixes issue 4512.

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/6917043

Committer: Brad Fitzpatrick <bradfitz@golang.org>
syscall: add type for struct tcp_info

R=mikioh.mikioh, rsc
CC=golang-dev
https://codereview.appspot.com/6900050
CONTRIBUTORS: add sledbetter (Google Corporate CLA).

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/6912062
spec: consistently use "indices" (rather than "indexes")

We have been using all three terms "indices", "indexes",
and "index expressions" indiscriminatly for index values.
With this change, "index" refers to an index value,
"indices" is the plural of "index", and "index expression"
refers to an array, slice, or map indexed by an index: a[x].

R=r, rsc, iant, ken, mtj
CC=golang-dev
https://codereview.appspot.com/6912056
Move color macros

    Move color macros from eunit.hrl to
    eunit_tty because just the eunit_tty
    have needed of it
Add google.php to .gitignore
bq: support query expansion in phrase
#307 Nsnotify support for OS X 10.8.
Fixed a test.
Keeping the original order of preferred notifiers.
Removing doc references to the nsnotify_guard gem.
Using terminal-notifier instead of nsnotify.
Fixed some errors on other environments than Mac OS X
Fixes old syntax stuff and adds a better implementation of the available? method.
Catches all Load and NameErrors appropriately whether the terminal-notifier gem is present or not.
Merge remote-tracking branch 'foxycoder/nsnotify'
Fix Terminal Notifier formatting.
Fix wrong gem name for terminal_notifier.
Detect when no readline support is available. (Fixes #312)
Update Emacs client docs.
Simplify available? method and add docs.
Add terminal notifier info to the README.
Site updated at 2012-05-19 05:15:38 UTC
ffmpeg: added libs packages as dependencies.

* updated ffmpeg to enable previously enabled decoders/encoders
  based on libogg, libspeex, libtheora, libvorbis.
* removed sources for these libs.
ffmpeg: updated optional packages removing --disable-mmx option.
shipform
UI experience enhanced
Build centos RPMs on the build servers and download them.
Missing still: Uploading to server and building the yum repository.
[mms] Disable blacklist, vacation, and whitelist API methods if the preference is locked.
Do not export `it` and `describe` from Test.Hspec.Runner
Fix tests
Ensure all errors are reported in the zif command line tool

Correctly set the error return value when non-boolean values are returned.
Encap caches and maps
Improved signal generation
Tue Dec 18 18:02:36 EST 2012
Can now decide whether to create a style tag
[ai-2] bot login fix
[ai-3] fix for random bots have no spells in R2
[ai-4] HasAura() checks by id first then by name (fixes tree of life and shadowform auras)
[ai-5] user-friendly message when bot cannot talk to a player
[ai-6] db name typo fix
[ai-7] GenericMageNonCombatStrategy inheritance fix (preventing mage bot following master)
[mangos-wotlk] merge
[ai-8] mage test case improvements
fix android putimagedata bug
add hasClass

add hasClass function;Only check one class
hittest변경

hittest변경
More conversions of Strings to Exprs.
Fixed a bug with Mash
Minor fixes of last checkin


git-svn-id: svn://irodssvn.ucsd.edu/trunk@5292 ea137bd6-aa86-47b6-b90d-b101d9f19a90
Update append to use predecessors
Add : ActivityDetailB, fxgt; label "min".

Close #248
Restructuring. Removing old ideas.
Some consolidation of config.
added suisnail example
Merge branch 'master' into 31
ported message
flags for send/sendmore/recv socket methods
Merge branch 'master' into 31
ported socket
fix compile errors
more context tests
poll and socket tests
message tests
updated sharding FAQ and sharding tutorial
Starting with atlys support
Started with atlys support.
Update manipulator screenshots.
Pack manipulator screenshots
ruby: add DFHack::VERSION
Clean-up
Improved error messages.
Mention necessary quoting with `:=`. #77
Basic Tileset

Also updated splashscreen and space to play from title screen
reshuffled files to correct places
kayttoliittyman rakennus aloitettu
unify kdd and ranged search
Added unix:xinetd_test adapter.
Clean-up for the dual-track SSH process implementation.
streams2: The new stream base classes
module: Support cycles in native module requires
Add 'stream' as a native module in repl
zlib: Use new streams (Not passing tests yet)
streams2: Convert strings to buffers before passing to _write()
zlib: Bugfix and assertion
test: Fix test-repl-autolibs inspect call
zlib classes do not have a destroy method
zlib: Use valid flush, add guards to prevent next time
zlib: Don't flush while writing
docs: add punycode to TOC

Refs #3301.
Don't rely on flash
Add dependency on rsync to core
Douglas gets points for first 1.7.0 bug!!!
JRUBY-2724: I've added some tests and I tried to fix unc pathing
Merge pull request #178 from lukefx/fix_JRUBY-2724

JRUBY-2724: I've added some tests and I tried to fix unc pathing
* Raise Java source level to Java 6 in Eclipse settings
OpenSSL::PKey.read has one required, one optional.
header convenience
flexible form encoded body
comment out background-color
timeline default show home timeline
Use proposed standard property name, not prefixed
完成了lpAuth的测试和示例代码
[#27855687] Add walrus
Fixes in bielefeld scenario
Anonymous url in submodule to possibly help codebetter build server

See also http://teamcity.codebetter.com/viewLog.html?buildId=43760&buildTypeId=bt619
Merge pull request #38 from loudej/patch-1

Anonymous url in submodule to possibly help codebetter build server
More progress toward whiskerization
Added relative addressing mode.
Added simple branches.
Merge branch 'master' of ssh://github.com/kennib/e-m-
Correction pour php 5.4 : utilisation de la zone Europe/Paris par défaut quand aucune zone n'est configurée
Mou and Github renders .md in different ways.
lost macros
tidied docs a little more
fifth
six
dd: исходники и макет
Update lib/ai4r/neural_network/backpropagation.rb

had to write always own method with result comparision
add <itunesu:category> to generated rss feed
Initial commit.
Merge github.com:kuu/Chef.js
Copy and modify the bits from efibootmgr shamelessly
Remove the trailing whitespaces
Add a simple program to manage the MOK variables
add gitignore
bugfix: -N fails ropebwt
h264: use asm cabac reader under a generic condition

This removes a dependency on implementation details from generic
code and allows easy addition of the equivalent optimisation for
other architectures than x86.

Signed-off-by: Mans Rullgard <mans@mansr.com>
avutil: change GET_UTF8 to not use av_log2()

This removes an inter-library dependency on ff_log2_tab causing
linking errors in some configurations.

Signed-off-by: Mans Rullgard <mans@mansr.com>
ppc: do not pass redundant compiler flags

The -mpowerpc64 and -mpowerpc-gfxopt flags are implicitly set by
-mcpu as needed.  Passing them explicitly is redundant and can
conflict with user-supplied flags.

Signed-off-by: Mans Rullgard <mans@mansr.com>
fix a wrong file in migration
unset screen-256color and add whoami to status line.

because the old linux distributions do not support screen-256color,
so we had to disable it.
Custom Post Meta Functions. Add/Update meta post.
fixed paragraph break
redid the JSR logo
added trailing slash
changed post date
changed managing editor
updated podcast artwork
add mediaelement as a submodule
add mediaelement player
remove the modal, which was causing errors
removed files that should not be under vc
merged in media element addition
added information about branches
removed horizontal rules which look bad on mobile site
merged in remove modal
added some space above the player on mobile
added link to iTunes store
enlarged podcast art to recommended size
added production deploy tasks
fixed typo
added editoral board member
Don't split CodeObjects::Base#type by NSEP, it should be hardcoded to ::
Disable 1.9.2 on travis... sigh
getdir and read basically worked
reg.
test.
migration.
Add note about Safari Extensions
Repair XML conformance
Terminata prima versione della sezione definizione
Deleted not used solve function.
Mediaportal pvr addon: cosmetics and code cleanup
MediaPortal pvr addon: add experimental support for timeshifting
Add smalltalk mode
At least on 2.4 kernels, need to include <linux/types.h> for <linux/filter.h>

Otherwise, the compile fails as types such as _u32 aren't defined.
Update to handle pcap.h being in /usr/include/pcap.
player doesn't need to be explicitly passed
Update Pegged.
Enable pegged compilation
Keep alive the Socket in the right way.
one last thing to get working…..
More doc updates, and moved Serializer to a subpackage.
moved error messages on separate div
* Take 2 on fixing the empty command parsing.
 * Fixed issue with checking rate counters (such as disk idle %)
 * Fixed (I think) the negative denominator counter issue
 * Fixed so indexes are only converted on \\123\\ and not also \\hello 123 world\\ which caused some issues with numeric counter variables.
bumped version
Merge branch 'master' into 0.4.1

Conflicts:
	changelog
	version.hpp
	version.txt
2012-06-05 MickeM
 * Tweaked all servers to use the new internals and added first testcase for NSCP socket

2012-05-24 MickeM
 * Reworked real time event log support to be a lot more flexible
   You can now specify all options on a "filter" level.
 * WARNING*
   Old syntax NOT supported (and will not upgrade) but hopefully not to many will be affected.
 * Added support for ipv6 allowed hosts validation

2012-05-21 MickeM
 * Sofia Born (My second daughter)
fix #186 on newast, ignore implemented methods in getAbstractMethods on factory

- note this only checks for methods on the initial type itself, and not superclasses.
- otoh, the current impl doesn't check superclasses for interfaces either, so ....
update text component
Re-enabled test1 and corrected the coefficients
IRB -> PRY
Remove duplicated prototype
Some WEB formating
Fix typo
Fix a few parameter tuning problems
changed function of control and space
give the actual reason for this TODO
fix the setup of config
bump version & update gem info
serialize / unserialize json messages passing through local node

  so as to make sure local node is conforming to json-rpc
define ACTLR_FW and ACTLR_SMP constants
Print usage in case using -o without outputfile.
Costmetic change.
Merge pull request #451 from monaka/pr-print-usage

[xpcat] Print usage in the parameter error.
changes for emitter. work in process
Added Image Import Ability
Included Import Example in README
Merge pull request #60 from mtaylor/import

Import Images, resolve issue #42
Catch XML Syntax Error exceptions in Template
Merge pull request #62 from mtaylor/XMLSyntaxExceptions

Catch XML Syntax Error exceptions in Template
Added os method to Template model
Merge pull request #65 from jprovaznik/templateos

Added os method to Template model
random commits trying to save and retrieve local data
improved duplication problem, where duplicate articles with different
time stamps were showing up.
And the Stupid Bug award goes to...
Fix on windows build script
add -std=c99 flag to the compiler
add vector insert and prepend methods
add test cases for vector new and append
add test case for vector expand
i2c write with param
testing wip
Merge branch 'master' of github.com:nabriski/Ys
key_commit: Tweak to taxstatement print
key_commit: Tweak to tax statements
key_commit: tax year print tweaks
b100: removed unused files from merge
sbx/wbx: clear R/N counters before tuning the LO

This helps consistent phase offset between mixers when a timed tune is performed.
uhd: special case boost versions for ipc namespace
Merge branch 'master' into next
pull in dtrt from my XEmacs setup
loader.php: removed normalization of PHP directives; header "X-Powered-By: Nette Framework" is sent by $application::run()
Optimize the allocation of the buffers larger than pageSize

Use AND and XOR wherever possible to get significant performance boost.
Remove a unnecessary annotation
Implementacion de funcion Done

Implementacion de funcion Done
Widget content editor
Jobs...
* adding better support for using and not using read prefixes
s
add bank.java
Merge branch 'master' into test3
update p1: use copy function
Answer to Answer(s)
web-components -> PMS
basic authorization using webrick
fixing spm.utils *OutputSpec inheritance
Merge pull request #412 from bpinsard/spm_utils_ospec_fix

fixing spm.utils *OutputSpec inheritance
Prepared domain classes for  new update method.
Merge branch 'master' of https://AndreKristensen@github.com/niths/niths.git
Fixed 2 failing tests.
Initial Commit

Signed-off-by: Nick <adminadminfunction@localhost.(none)>
Remove CNAME and _site
Fix broken link and typo in Readme.md
Well, apparently this index actually matters. (the way our table model works allows us to delete/insert the "first" row and still have the data displayed correctly.)
Target 1.7.
Use visibility: hidden instead of display: none for anchor/source
libopenflow: Fix exception resending some packets
public version of my Vim configuration
Added tree cardinality defined as number of ancestors
Getting book's image (not completed)
Useless method moveActivity is deleted
Add google analytics script
Move analytics script to <head>
S3XML: "alias" attribute for disambiguation of components. Components
which have an alias that differs from the resource name *must* use the
alias-attribute in S3XML. Link-table components use the alias of the
linked resource.
Fix missing orderby in S3SearchOptionsWidget (required for postgres).
Fix #1020 and #1021
Bug fix (catch 0-option) in facility type represent.
Merge http://github.com/nyslabor/UX
Signed-off-by: Jeffrey Herb <herb.jeff@gmail.com>
Stray merge text
Adds default behavior to applySearchFilters()

Now if key is parameters is a column name, adds a where clause on that
column.
Fix #197. Shorten Dublin Core element descriptions.
Change items/advanced-search to items/search. Ref #374
Continue to run if sources fail to load.

Instead of throwing an error when a source is not available, we should be logging errors somewhere accessible to the user.  This change makes it so a viewer can be configured to upload to a layer source and the viewer still works if the layer source is not available (fixes #SUITE-280).
Avoiding "Map Data" popup with Google Maps > 3.6

The v3 mixin tries to reshuffle dom elements (in repositionMapElements) in  order to properly display attribution, terms of use, and the Google logo.  This worked for version 3.6, but in newer versions the dom structure has  changed and we mistakenly move the "Map Data" popup to the viewport thinking  it is the "powered by" container.  This temporary workaround hides the popup. There are some clear violations in the terms of use here (links not clickable), so this needs to be addressed properly (see #SUITE-278).
Fixing dependency path.
Added Mojo Header
Add SYNCPUB/SYNCSUB example.
Introduce some optimizations to SEND.
Update tests for newer LET+.
ignoring generated files
reverted changes made by ide

all tests are now working!
no data message; removed headers made redundant by tabs
Adding in unit tests. Let's get going :)
Adding in the usual kruft
pushing up random junk
ie9 onprogress workaround
improved file filtering
added pd-extended output~ abstraction
added flatgui and updated makefile
cosmetic change
moved the source to make room for the entire tree
added the rest of the tree
moved commit script
added README.md link to demo
Consulta precio listo
unfudge tests for indirect sub name declarations
book edits
book edit correction
book: calc DIC attempts
book: todo updates
removed frame agents & controllers; removed resource processors; added request pre and request post; changed the agent to handle the browser only, use  for all other situations; closed #21, closed #7
fix demos link
Skip test if directory does not exist

Would be good to run this using a directory which is existing
everywhere.
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
- Updated to version 2012.8 (2012h)
Merge branch 'PHP-5.3' into PHP-5.4
fix spelling error in doc
Update md5 & correcting xml folder place inside includes
Removing .gitignore
Support KB register.
add brace to backstrech class
fix bug entryDuplicate not return the new entry
fix bug mutableDumpToSStable()
new lecture
designing achromat
pause
Added custom command label
Merge branch 'master' of https://zygisx@github.com/povilas0/OS.git
grammar or grandma
Merging master, fixed header height
upgraded to the newest version of bootstrap
Merge pull request #53 from alfrekjv/feature/v2-pages

Feature/v2 pages
ensure that regsitrants returns unique email list
Added tests for the queue.
Merge branch 'feature/queue-test' into wip-0.10.0
Improvements to the event manager tests.
Merge branch 'feature/event-manager-tests' into wip-0.10.0
Remove *Process* dependencies.
Merge branch 'feature/remove-process' into wip-0.10.0
Use dedicated route for profiles (user / organization).
UI for organizations and user profiles.
pages apps scafolding
Merge pull request #90 from pyrated/master

Fixes node corruption in HklList
Merge pull request #91 from pyrated/master

Finally deleted those now pointless files.
Merge pull request #92 from pyrated/master

Enables variables of core types
data_editor alpha
'multiple questions after start problem' solved
Removed dynamic vars.
Instrumentation requires RackDelegation

Since it uses request and response methods
Add missing require.

I was trying to use those files without Rails and that require was
missing.
Do not mark strip_tags result as html_safe

Thanks to Marek Labos & Nethemba

CVE-2012-3465
Add nodoc to DummyKeyGenerator since it's a private thing
Merge pull request #5454 from luke-gru/luke-dev

allow zero-arity proc for AbstrController::layout
Add Enyo UI
Add stick & unstick to the JS wrappers to use them from the cinnamon windowlist
Merge pull request #10 from AlbertJP/master

Add stick & unstick to the JS wrappers to use them from cinnamon
Put popup menus into a separate window group which appears on top of everything else
Fixed libmuffin0.symbols to allow compilation when building deb package (we'll need to have a closer look at this)
Fixed warning brought by previous commit
1.0.2
bring nova attrs into nova namespace

- edited attributes
- updated readme
- updated relevant recipes to use new attrs
- updated cookbook version
- updated libvirt template
Merge pull request #34 from mancdaz/namespace

bring nova attrs into nova namespace