labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #2516 from giantlock/develop

Doc fix for pull request #2505
Adding image_create, image_delete, image_show to openstack glance
Merge pull request #2517 from techhat/openstack

Adding image_create, image_delete, image_show to openstack glance
Fix #2513

This is embarasing, looks like the wrong backend function was being used
Fix #2503
Use often instead of must
salt.utils.yum*: clean up __virtual__() to use os_family grain

Fixes #2294
salt.modules.grub: Fix some bugs and move from boot to grub

Since it makes sense to have separate grub/grub2, syslinux, and lilo
modules because things like conf keys will be TOTALLY different, move
the name from boot to grub.

Use a with statement for reading the config file and also wrap it all
up in a fancy try/except that raises CommandExecutionError on issue.
salt.utils.yum*: clean up __virtual__() to use os_family grain

Fixes #2294
salt.modules.grub: Fix some bugs and move from boot to grub

Since it makes sense to have separate grub/grub2, syslinux, and lilo
modules because things like conf keys will be TOTALLY different, move
the name from boot to grub.

Use a with statement for reading the config file and also wrap it all
up in a fancy try/except that raises CommandExecutionError on issue.
salt.modules.grub: Fix some silliness from my previous commit
Fix #2377
salt.modules.mount: relatively major robustness cleanup

    - Make is_fuse_exec() actually work and remove code from it
    - Wrap all open() calls in try/except and use a with statement
mount module: Raise an exception when ldd isn't available in is_fuse_exec()
Fix #923

This detects recursive requisites as the happen, since it was
proven difficult to do so within the verification
salt.modules.linux_sysctl: make file reads/writes more robust

    - Use the maxsplit parameter on all str.split() calls
    - Wrap all file access in try/except and with statements
salt.modules.state: make cache file writes more robust

    - Wrap open statements in try/except and with
    - Use variables for crazy os.path.joins(). It reads easier

salt.modules.ldap: Add a small todo for ldaps:// and ldapi://
convert docstring into comment. they probably overwrite the module top docstring.
fix ENCRYPTED usage on user creation
Merge pull request #2519 from bclermont/overwrite_module_docstring

convert docstring into comment
change marker icon
navigation arrows
assets --
Adds validation of JS and PHP
Compare file extensions case insensitively
Add Swedish translation

Closes pull request #164
Add German translations for enable_wrapping and disable_wrapping

Closes pull request #166
Update Slovak translation

Closes pull request #167
Add scm element to POM file

Closes pull request #168
added %%= op
added projects using LiveScript section, scroll y for sidebar on auto
Change "scar" to correct "scanr" in sidebar.
Merge pull request #16 from wetmore/gh-pages

Fix typo on sidebar
Small tweak to the text
Remove the note about work in progress and simply turn it into a roadmap
Improved grammar
Improve custom constructors example
Improved the underscore fall-through documentation
Improved the section on private members of `this`.
Improved the multiple implementations example
Improve the example for recursive evaluation with a plain function
Add a test for recursion using a simple function
Add the license notification more prominently to the README
Remove paste-noise
Improved grammar
Warning about documentation that is under construction
Improve the nested expression example
Improved the wording of multiple implementations (multiple keys are not multiple ADT's, an interface represents one ADT)
Fix another terminology issue in multiple implementations README
Replaced the license link with an image
Improved recursion for regular functions on data values
Improved test for recursively evaluating regular functions on ADT values
Improved example for evaluating regular functions on nested values (added a printTrace method)
Merge branch 'master' of github.com:rehno-lindeque/adt.js
Mise à jour en version 9.1.5
Addition of initial tools for sector integration. TODO:
1. Iraklis algorithm work to make faster.
2. Awaiting sector code to be updated.
Info box: refactoring to pixel info
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git

Conflicts:
	org.dawb.workbench.plotting/plugin.xml
Pixel Box: adapted to use ROI instead of Region
Pixel Info: corrected intensity value, moved to 2D type
Pixel Info: fixed exception non visible 2D tools
Info Box: delete Info box tool files
Changes to support editing of ROI location on properties form.
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git
Added proper ROI for PointSelection.
Added back in three tools which rita removed.
Removed invalid cast in InfoPixelTool to avoid errors with it.
Pixel Info: added scisoft license
Merge branch 'master' of http://github.com/DawnScience/dawn-ui
original layout build Makefile.in
add MOZ_CCNX into the top level module Makefile.in
add the actual ccnx_patch
original all.js
enable 'media.h264.enabled' by default in firefox configuration console
ccnx patch
sdfadfadg
Delete tpope rails
Mouse wrapping bug for CEGUI widgets.

- Mouse position for CEGUI widgets wrapped on borders of viewports in a
  wierd way. Fixed.
Mouse events not passed to CEGUI when over object.

- OrxObjects should not steal focus from CEGUI windows as windows are on
  top. Fixed.
REduce trescheludedTime
commented out debug line in Geolocate.php
Import irc2.9
Import irc2.9.1
Import irc2.9.1p1
Import irc2.9.1p16
Import irc2.9.2
Import irc2.9.2p2
Import irc2.9.2p3
Import irc2.9.3
Import irc2.9.4
Import irc2.9.5
Import irc2.9.5+IPv6
terminal connection script
кот переехал, подправил импорты
Fixed a bug which prevented "destroy" command from working
Added a User type to the Save package.
test

Change-Id: I8db23c11f7ca5efbdd5cbb2c0198a4b248a97349
Fix declaration semicolon bug.
Changed the method of fetching the location

Firefox doesn't support window.location.origin
Convert custom plugins to modules
added initial application ui
Fixed csrf token bug
Move WriteIn/ReadIn to raw/
Testing tweaks.
util unit test
Random prog working
oslo incubator
Use built in hash change event
Split navigation controller into view controllers and move html rendering to them
Destroy controllers when switching pages
added initial version of exec/command framework
select radi
implemented methods that generate ground-operators (on simple cases)
enable empty set
itools: fix dependency on pygobject
Module ups
Fix descender parameter was ignored on rendering truetype fonts
Backport fix to split() after open() (regression in 1.1.7).

https://bitbucket.org/effbot/pil-2009-raclette/changeset/fb7ce579f5f9
Merge pull request #12 from tk0miya/master

Fix descender of some characters are chipped
Merge pull request #15 from sfllaw/master

Backport fix to split() after open() (regression in 1.1.7).
Prepare release
Wording
Merge pull request #16 from aclark4life/master

New release
Add sphinx docs
Don't track
Link to docs
Tweak
UNDEF more types before including windows headers
Merge pull request #19 from mattip/master

fixes for windows build
Release 1.7.7
Fix manifest
Fix manifest
Fix manifest
Fix manifest
Onwards
fixed reading of EPS pictures
found in: http://www.mail-archive.com/image-sig@python.org/msg03054.html
Added \Myak\Log\WindowsConsoleLogger
ENH: Working on the common directory.

Change-Id: I3b04b2d2ee141d1a85b85fb4018f332262a47184
Add Experiment Manual
WIP (g++-4.7-friendly now)
Improved ruler.clj
pushing rest of missing files
added writeFile to config object
attempted to remove duplicate Privacy Policy entries
Give tariff item group a push to be returned as top search results.
Update changelog.

Conflicts:
	CHANGELOG
Merge branch 'stable' into staging
Update changelog.
Bug 804606 - Stop Flash from crashing in CoreGraphics mode on accessing "our" CGContextRef outside of the call we use to pass it. r=bgirard a=bajaj
Bug 808545 - Tweak the exception message for runxpcshelltests.py profile cleanup failures; r=gps a=test-only DONTBUILD

--HG--
extra : transplant_source : %0Al%B7%94%7E%07%18%9E%B4%D4g%3C%0B%15%BDXNy%E2%DB
Don't use GetIonContext()->cx in ARM assembler, bug 817509. r=mjrosenb
Bug 816902 - Prevent suggestion prompt buttons from being clicked multiple times. r=mfinkle
Bug 815414 - Move the DST offset cache out of JSContext, and LocalTZA out of a process-wide static, into JSRuntime.  r=jorendorff

--HG--
extra : rebase_source : 9c02de9c6db06cf70a89c9a57d65e94655803931
Bug 807659 - Also configure HTTPS proxy from APN settings. r=philikon
Bug 733754 - Deactivate the 'OK' button if there is no text entered in Master Password credentials textbox. r=bnicholson
Bug 817343 - Ensure that incremental GC validation happens (r=jonco)

--HG--
extra : rebase_source : 63096f25eec9f1008169662eb4011ff30045aed9
Bug 815148 - r=fabrice
Bug 813356: Skip subtrees with null roots during resolution. r=roc a=blocking-basecamp
Bug 817724 - Change some fields from JSBool to bool. r=luke
Bug 816168 - Split out WebGLRenderbuffer into separate files - r=bjacob
Bug 816181 - Split out WebGLShader into separate files - r=bjacob
Bug 811566 - Compile INTRINSICNAME correctly in JaegerMonkey. (r=bhackett)
Bug 784297 - Thumbnail for about:home is out of date/incorrect. [r=sriram]

--HG--
extra : rebase_source : 916eb3a43f9a564d4f85dca19a9d51c73799e140
bug 801466 - part 1 - remove uses of prmem in layout/ xpcom/ and modules/ r=roc
bug 815783 - PAC reload check use configured string not normalized uri r=biesi
No bug: Fix whitespace error. DONTBUILD
Backout ad1ee5f59a6e (bug 817343) for orange
Bug 817515 - Move JSOP_NEG implementation to NegOperation. r=djvj
Bug 817626 - Move JSOpToCondition to IonMacroAssembler.h r=djvj
Add generic priority queue implementation, bug 817769. r=luke
Attempting to fix view loading for legacy applications. (Or really, all of them.)
Changed PID constants to float
Rework the teleporting action to remove unneccesary rulebooks
Add font PTS55F_W.woff
suppress jekyll
Use the cursor from the g object.
Mechnically extruded method names
Merge pull request #122 from iarna/no-intercaps

Mechnically extruded method names
Add --version and add a util for incrementing it
Merge pull request #123 from iarna/version

Add --version and add a util for incrementing it
- new arrow keys
- new tab key
- longer timeout for on-screen keys
- simplified arrows to not do selection.
- not vibrating on arrows as it causes double-vibration sometimes and artifacts
- Optimized layout and spaced out buttons more.
- Now not fading at 4 seconds no matter what. Touching the screen or a button refreshes the timeout
Updated Number Slider so that events are eaten when min/max is changed.
Refactored TextBox logic.

Signed-off-by: Stephen Elliott <steell1890@gmail.com>
Made all nodes in the side menu appear dead.

Signed-off-by: Stephen Elliott <steell1890@gmail.com>
Updated Loft Form node so that it doesn't need to take in Curve References.

Signed-off-by: Stephen Elliott <steell1890@gmail.com>
Fixed issue where built-in nodes were not being colored DEAD.

Signed-off-by: Stephen Elliott <steell1890@gmail.com>
Implemented IDisposable interface for File Watcher so that its resources are garbage collected timelier.

Signed-off-by: Stephen Elliott <steell1890@gmail.com>
Added a State Dictionary so that users can store information that will persist between runs of a single Python Node instance.
Code cleanup.

Signed-off-by: Stephen Elliott <steell1890@gmail.com>
Updated dynSelection.cs so that nodes are still marked as dirty when nothing is selected.

Signed-off-by: Stephen Elliott <steell1890@gmail.com>
Updated input/output text for the solar radiation extractor node.

Signed-off-by: Stephen Elliott <steell1890@gmail.com>
Fixed issue preventing new dynTextBox from working.

Signed-off-by: Stephen Elliott <steell1890@gmail.com>
What's New in November update
VDB: finally completed syntax for all DB backends *yeah*
bug fix: font tuple item assignment
Renamed "domain" to "models" and added default User model.
Problem 36 description
added file structure for date js localization
Added linkflood scheduler
removed packages folder
added nuget package restore
hir: do not replace results in instruction
Upped logo size.
Don't access datum pointer when datum is NULL.
Store "cache enabled" flag in EState instead of inventing a new context
struct. This reverts most of commit
0791252767973b21914dbfdcb4f727f5d7677afd
Initial commit (topo svn r12117).
Merge pull request #1 from ceball/master

Initial version
用户中心－收藏页 完成
[PowerMaster] V0.3
Teste ao github
Merge remote-tracking branch 'origin/master'
[TechDemo] Demo de ligação entre java e mysql
hw7-9.py
lru-cache@2.0.2
bunyan@0.13.3
npmconf@0.0.12
npm-registry-client@0.2.7
TLS Improvements

Some of these should probably be defaults, or documented much better
Put time stamp on search logs
fixed schedule formatting
fix sv_vote_master_commands
Merge branch 'xst_configs' of github.com:itsme-/server.configs
modified: readme.txt
fix makeDataSeriesAccuracyType
Adding the y axis builder
Building grid
Building the table
KOKU-1381: Forgot to display a field from last commit

KOKULT-646
	Display the KKS organizations in consent forms which I forgot to do in the
	last commit.
KOKU-1393: Portlet WS Proxy

KOKULT-820: Portlet WS Proxy

* Moved attachment handling code in one place
dascript now uses sed
Updated the overview and added a file uploading document
Updated
Updating the file uploading doc.
Adjusting the formatting a little bit
First commit
Update comments
Update
Added new files
Fixed path to logging.properties
made joeson more like regex, for * // {} type patterns.
Improve message display + fixes
Loading module separated; portals loading added
separated specs
Sun Oct  7 09:08:05 MDT 2012 - More work towards importing stored procedures, bah
- Added DbObjectTestActor and TestArranger for the purpose of helping with unit testing.

- Added sample test project to display usage of Actor and Arranger classes.
- Fixed a bug regarding calculation of code coverage.
- Updated the format.scrub file for more accurate code coverage.
Make kajammer.desktop pass validation.
Correct QT network library variable to fix underlinking.
Merge pull request #49 from kensington/master

QA fixes
UP-3505 Updating SQL portlet pager view to use proper paging links markup for current version of Fluid
UP-3269 Disable layouts now properly treated as disabled
Merge pull request #58 from jdlich/UP-3269

UP-3269 Disable layouts now properly treated as disabled
UP-3537 Disable window persistence when rendering json layout
Merge remote-tracking branch 'upstream/master'
UP-3450 Add cast check
update vim-fugitive
update vim-powerline
configure ctrlp
WordPairEditor: Make addWordPair() more functional
[OJS.de DOIs] Fix errors found during final acceptance test - Make sure that only articles from published issues will be displayed in search results
Stub for trigger script
Changed all document.something to $
Remove posts from if statement
Fixed vim bundle submodules
Split exceptions into categories.
Merge pull request #27 from tomwys/master

Exceptions categories
Added some Code Contracts and Code Analysis fixes.
Atualizando arquivo

Signed-off-by: Alexandre <aneto@aneto-Aspire-4743.(none)>
Merge branch 'master' of http://github.com/jimmyskull/ES3
Merge branch 'master' of http://github.com/jimmyskull/ES3
Adding .gitignore
Fixing a bad reference, trailing whitespace, and adding reverse lookup
Merge branch 'master' into reverse-lookups

Conflicts:
	sayserv.js
Merge pull request #1 from jasisk/reverse-lookups

Minor ref fix and reverse DNS lookup
Created separated module to deal with creation of renderer
Fixed #5 (Moving text) and Fixed issue #6 (morphing lines).
added user login only, missing last cucumber step
add a file
Add text
qwdqwd
Stuff done today.
added color prompt to .bashrc
adds some last little bits that I was too tired to include before
mail module: add MIME attachments, port and addresses with phrases
     Add HTML-escaping to code examples in rST tempate of module-formatter
     Add support for specifying port, addresses with phrases and attaching files
     Add support for custom headers and document version_added for new options
Rev for 0.2.1 release
updated io.rst with some typos and docs for indicies
duration parsing
*everything
add lambert conic example
Set default paths to current directory.
Ajout du cheese dans le cheeseburger
Restoring hibernate core backup
partial next button implementation
https://issues.jboss.org/browse/FORGE-619
Recursive ManyToOne doubled-up
imports: https://community.jboss.org/message/752107
FORGE-605 copy plugin added
Merge pull request #184 from kennardconsulting/master

https://issues.jboss.org/browse/FORGE-619
Merge pull request #185 from tremes/copy-plugin

FORGE-605 copy plugin added
FORGE-605: Safer unit tests
FORGE-624: Reading source folder from POM and added unit tests
Merge pull request #186 from gastaldi/master

FORGE-624: Reading source folder from POM and added unit tests
https://issues.jboss.org/browse/FORGE-617
Merge pull request #187 from kennardconsulting/master

FORGE-617
ereg_replace function is deprecated on PHP 5.3.0 now will use str_replace
[AS7-4767] Test model transformation of web subsystem to 7.1.2.Final (version 1.1.0) of subsystem
modify coordinate field as text
Merge branch 'master' into import-export-equipment
refactoiring equipment search and list, and checkbox tag,....
upgrande to grails 2.1.0
initial layout changes
merge with master
merge with master and design
data magration
initial filter results, going to merge with master
partly done
fix where workOrder couldn't be create on a specific eauipment, fix location and dataLocation ajaxloader
Disable global ede mode.
Add config for generic-x
Add hypercomments.

Signed-off-by: Yuri Karabatov <karabatov@gmail.com>
Esc in insert mode mapped for kj
indenthaskell vundle
rearranged degratenuclide header file. easier to conceptually separate pieces now.
доходы
Help was beneath the header. it is now not.
SWITCHYARD-692 add default namespace to configuration XSL files
SWITCHYARD-691 have installer set execute bit on .sh files in bin dir
SWITCHYARD-693 Inherited dependencies missing version properties
move version back to 0.4.0-SNAPSHOT
SWITCHYARD-640: Create web app demo that showcases switchyard bpm task api
SWITCHYARD-699 add missing resource strings
[SWITCHYARD-658] - Added Camel REST quickstart
SWITCHYARD-683: Installing the forge is mandatory
added sample logs.
Fixed rum sample name.
Created main documentation page for Github web
Auto-update github pages
MultiFK get_object override
Formatted the readme, bumped version down.
リャマ本２章練習問題追加
Adding the fist drupal commit
move template to generators as parent
load all recipes:
* Repair the relative file path to point to all
ignore media/videos
video playlist importation now functional, AJAXified view, jQuery functions in playlist template, etc.
Try page lists some of your C# gists along with the examples
Name a bunch of function expressions in JSIL.Core for easier debugging.
Implement more of Enum.Parse.
Partial support for flags enums.
Fix ToString for constant flags enum expressions by using a method to create them instead of using the binary or operator.
Application layout and assets and first controller and route.
removed extraneous animation arguments and switched to arc4random_uniform
if there is no boarder image draw one with the CALayer, also rasterize the photo view for faster drawing and smooth edges
added prepare scripts for Human
added reference to SOCIS contribution
Merge branch 'master' of github.com:sunpy/sunpy
changed to recommend to latest readthedocs for docs.
Merge pull request #176 from ehsteve/master

Added reference to SOCIS contribution
Merge pull request #178 from khughitt/master

Added datatypes diagram + few small document updates
Merge pull request #179 from khughitt/master

Improvements to SunPy download support
Merge pull request #181 from khughitt/master

Improvements to the tutorial; renamed some methods in helioviewer module
Merge pull request #183 from khughitt/master

Fixes for sunpy.map and sunpy.net.helioviewer unit tests
fixed test failures in sun and wcs
small update to doc string
Merge pull request #184 from ehsteve/master

Fixes to tests
Fixed failing Map unit test
NEW: eb.TownMapIconModule: Handles Town Map Icon positions, fixes #33
Improved the error message for when there is not enough space in the ROM, fixes #35
arbejd

arbejd
MatchViewControllerへの遷移を実装
Added the animation commands and properties
Changed the order of the methods
Changed an error message
Changed the layouts and the orders
Added Pixel Based Event Tracking to README
Added validators in UI parts

Thanks to tapoton for initial commit
Added relation between product and category
XPS: prevent infinite loop
XPS: fix bad assertions
PDF/XPS: fix memory leak
XPS: fix memory leaks
Command line options with getopt_long
#228 only allow remote widget updates when stemming from Android OS requests
#228 version bump to 1.9.8
#96 setup sdk path for ActionBarSherlock
Removal of ajaxlink
Changements de certains skills

Le menu des skills affiche maintenant le manacost du skill ( mais pas encore celui du prochain lvl du skill)
Initial contributionremoved unused file
Add in a simple CLI based configuration program. It does not support nested configuration files yet, but will write out collector specific files into the collectors_config_path directory, loading any values that are currently there.
Add in a way to dump the configuration as it will be loaded by Diamond
Fix ifdef definision (it was sensors)

Signed-off-by: eldrad <nikofinas@gmail.com>
Update README.md

Give simple invocation example.
Extract a, b
changed div to span ...
preg_match for specific activity and add to full array
markup test
merge
Ajout d'un deuxième niveau de traitement de la requête
custom statistic file render
v. 1.4.1 - fix TSA authentication in CLI
Upgrade to Noir 1.3.0-beta7 and rework templates necessitated by new hiccup version.
handle invalid json
modifs pour test
added links to 1.0 releases
schedule almost
provision accepts a playbook argument
add forgotten import os
new title for read.pl
added less alias and now lessing git log
new idea mod commits - color scheme changes
se configuro la base de datos postgres
disappearance of bonus
all arrays now have a channel dimension (allowed nice simplification of constructNumpyArray())
added axistag tests for arraytypes
changed converters to use AxisTags; disabled array type registry; changed classes into factories
added tagged_array.py
added missing cmake entry for tagged_array.py
implemented VigraArray.channels etc. in terms of axistags
fixed compatibility rules; ensured that copy constructor copies axistags; started re-implementing NumpyArray::setupArrayView()
refactored tests; switched to new axis ordering convention
fixed NumpyArrayTraits<N, T, StridedArrayTags>; added tests for plain ndarray
reimplemented VigraArray constructor
added constructDefaultArraytype()
first working version with constructor based on axistags
first implementation of reshapeIfEmpty(TaggedShape tagged_shape,...)
fixed some bugs
before big refactoring
axistags refactoring half done
half-way through refactoring of the AxisTags class
finished C++ implementation of AxisTags
finished big refactoring
refactored impex (+ tests) and sampling
The tools view is displayed as a dialog for small screen.
Removing all footers in dialog.
worked on AI training and prediction modules
Added: SPARQL 1.1
add mailbox,signal
use full path of file.md
switch ctrl r to ,r
Add getApps to PMs
* Extend boardsAllowedTo()

! Save a couple of queries in the search (11) and quick mod11) by
combining permission  checks
+ Added support for seperating board results by permissions
view enhancement
rename call_routing to calculated_tranks
add routing table
fix model typo
lizhizhou
Merge branch 'master' of https://github.com/lizhizhou/IO26
added the letter c. . .
From version: CLB-v4.08-20-ga83beec [master]
[#39542179] create order action: comments and spec update
Remove mojodb upstart file (use db8 instead)

Signed-off-by: Anupam Kaul <anupam.kaul@palm.com>
Change-Id: Ie0606654026619770ba080f4b2378266988aa79f
l10n: Update Swedish translation (1964t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
l10n: vi.po: update from v1.8.0-rc2-4-g42e55

* translate 3 new messages
* review quotes

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Merge branch 'master' of git://github.com/vnwildman/git

* 'master' of git://github.com/vnwildman/git:
  l10n: vi.po: update from v1.8.0-rc2-4-g42e55
Merge branch 'master' of https://github.com/nafmo/git-l10n-sv

* 'master' of https://github.com/nafmo/git-l10n-sv:
  l10n: Update Swedish translation (1964t0f0u)
Merge branch 'db/doc-custom-xmlto' into maint

* db/doc-custom-xmlto:
  Documentation/Makefile: Allow custom XMLTO binary
Merge branch 'jc/ll-merge-binary-ours' into maint

* jc/ll-merge-binary-ours:
  ll-merge: warn about inability to merge binary files only when we can't
  attr: "binary" attribute should choose built-in "binary" merge driver
  merge: teach -Xours/-Xtheirs to binary ll-merge driver
Merge branch 'po/maint-docs' into maint

* po/maint-docs:
  Doc branch: show -vv option and alternative
  Doc clean: add See Also link
  Doc add: link gitignore
  Doc: separate gitignore pattern sources
  Doc: shallow clone deepens _to_ new depth
Merge branch 'rr/test-make-sure-we-have-git' into maint

* rr/test-make-sure-we-have-git:
  t/test-lib: make sure Git has already been built
Merge branch 'rr/test-use-shell-path-not-shell' into maint

* rr/test-use-shell-path-not-shell:
  test-lib: use $SHELL_PATH, not $SHELL
Merge branch 'jc/maint-t1450-fsck-order-fix' into maint

* jc/maint-t1450-fsck-order-fix:
  t1450: the order the objects are checked is undefined
Merge branch 'jc/doc-long-options' into maint

* jc/doc-long-options:
  gitcli: parse-options lets you omit tail of long options
Merge branch 'nd/doc-ignore' into maint

* nd/doc-ignore:
  gitignore.txt: suggestions how to get literal # or ! at the beginning
Merge branch 'bw/cp-a-is-gnuism' into maint

* bw/cp-a-is-gnuism:
  tests: "cp -a" is a GNUism
Merge branch 'rr/git-uri-doc' into maint

* rr/git-uri-doc:
  Git url doc: mark ftp/ftps as read-only and deprecate them
Merge branch 'jk/maint-http-half-auth-push' into maint

* jk/maint-http-half-auth-push:
  http: fix segfault in handle_curl_result
Git 1.7.12.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with 1.7.12.4
Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
  l10n: vi.po: update from v1.8.0-rc2-4-g42e55
  l10n: Update Swedish translation (1964t0f0u)
Git 1.8.0-rc3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
fix bug 760587: l10n save redirects to saved page
Fixed messy formatting
simplify
add built-in function for setting variables
create a map value
function for creating a map from an array
add built-in for creating functions
get rid of unneeded vars
add a function for evaling values
add more unittest assert options
start adding bootstrap unittests using the language itself
bootstrap unittests
more unittests using the language itself, fewer outside the language
Got extend RRT working. Also added a sleep to the graphics to slow down the replay
WIP: better javacc classes
WIP
WIP
WIP
WIP
WIP
WIP
jarred everything again
jarred everything yet again
preparations for pub
fixed another issue with the prompt loop
in CNode: changed the name of function "infect" to "add_pathogen"
Fix the problem of leading slash of a path
First version of momentum
product CRUD and admin login
delete doc
fix conflict
add bin release
Add: name, description, author etc for modules
changes to bar layout
minor improvments

git-svn-id: https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac@4232 63c20433-aa62-49bd-875c-5a186b69a8fb
Fixed bug in ISOBMF segmenter in context mode

git-svn-id: https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac@4233 63c20433-aa62-49bd-875c-5a186b69a8fb
using macports git version
cleaned up proj files
removed VS project
added physics class
Merge pull request #1 from malleyne/master

fixed semicolon bug in physics class
fixing merges
started to add gui, make sure to pull down ofxUI from rezaali
broken version
Merge branch 'master' of https://github.com/alexiswolfish/AiVDJ
added buttons to GUI
switching to alex fix everything mode
fixed merge shit
Merge pull request #2 from jlyons871/master

This works!!!!
readded semicolon in the physics class
okay fixing JAKES CORRUPTION
Melissa's local changes
merge w/ alex
gitignore file extended to ignore dist builds and the MANIFEST
Issue #17: Situation handled when getdefaultlocale returns None in i18n.py
add clientthread
Added some information in rfc 85
Fixed some compile problems (underline too short), cgi/openlayers
Typewriter tweak

Make sure old text doesn't hang around when another bubble colour is
started
Record the colum of each point to track which was discarded
Show playing video.
technologies page look and feel improved
Cleaned up in preparation for 0.4.0 release
Added .bib file
Added users guide pdf
Added log directory and README
super rudimentary theming mechanism w/o caching
fixing gitignore
fixing conflict maybe
minor fixes
16進数にしてなかった…。
initial commit
Merge branch 'master' of github.com:mbadov/hon-api
new file:   mobiexceptions.hpp
clean ch3 workspace
Remove auth from hydra
Version 0.13
Create temp files in the /tmp tree -- it makes it safer if an exception accidentally leaves a tempfile on the filesystem.
Make the restricted_open function work for py.test's .pyc cache files.
Add warning about `to_table`
edit admin system source
add admin source .
add images.
device connection change event
x11-misc/appmenu-firefox-15.0.1:version bump
media-sound/deadbeef-0.5.4: version bump
Completion jobs with update to Baan
[analyzer] Introduce clang_analyzer_eval for regression test constraint	checks.

The new debug.ExprInspection checker looks for calls to clang_analyzer_eval,
and emits a warning of TRUE, FALSE, or UNKNOWN (or UNDEFINED) based on the
constrained value of its (boolean) argument. It does not modify the analysis
state though the conditions tested can result in branches (e.g. through the
use of short-circuit operators).

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156919 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] Convert many existing tests to use clang_analyzer_eval.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156920 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] Fix RUN lines for old XFAIL tests, one of which actually works.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156921 91177308-0d34-0410-b5e6-96231b3b80d8
[Analyser] Remove unnecessary recursive visits for ExprWithCleanups and
MaterializeTemporaryExpr.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152730 91177308-0d34-0410-b5e6-96231b3b80d8
Another test for r157025  <rdar://problem/11460990>.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@157034 91177308-0d34-0410-b5e6-96231b3b80d8
Added iris k=2 stuff
set colorscheme also for vim
Merge branch 'master' of github.com:mhalder/config
Basic rspec build completed
adjusted buttons and css
TimeZoneId, TimeFormat, DateFormat always have default values for the instances.
Fix for test case select_implicit

When the test case is compared with the one in PG, we had, for some unknown reason,
changed the column used to order rows in one of the queries.
This patch reverts this change.
Expected output is changed accordingly.
Code cleanup
Added adm-zip for zipping, added check for custom plugins in windows home dirs, some code cleanup
Lots of updates for tmux and syntax highlighting, etc.
New XML encoding
showing references now works for entities

a reference consists of

{"date":"2012-06-05","title":"a title",
"link":"link to the reference","medium":"medium the stuff appeared in"}

fill in data: {"references": [reference,reference,reference]}
this is a commit of three-commits
to test
test commit 1
to test

test commit 2
to test

these commits are practices

practice for git command
practice 1

this is the test

practice 2

this is the test2

practice 3

this is the test3
Merge pull request #4 from deepmt/deepmt_push1

this is a commit of three-commits
Matrix33 copy constructor
3x3 matrix determinnt
Diagonal matrix determinant
isMutable()
General purpose determinant calculation
Add Iterable support to AVector
Now can be packaged to use in a browser
Updated all the plugins, added Signature
Added slate configuration
separated http into four files
Add the test scripts from CmdDirectoryCompletion.
modified side menu
improved Submenu helper
added AdvancedForm helper
improved Submenu helper
improved admin topbar (now totally using Submenu helper)
improved admin css
improved (again) admin topbar and css
improved reset css
added switch editor and read more images for buttons
improved helpers
added jquery-ui
improved ckeditor functions
modified admin css
Fent-lo bonic
fixed music title, "United Earth"
Podstawowe strutury danych i interfejsy.
CDI-190
- update assertion text
- add test for disposer method IP validation
CDI-222
- update assertions for inheritance of member-level metadata for generic
beans
CDI-177
- default bean names clarification
Added check if notification was already marked as read. Also added some css for visual feedback and counter change.
updates gert
Add autoload part to composer json
Merge pull request #10 from akkie/master

Merge changes with base repository
Add $not negation to queries. Closes #20.
release: Small changes to NEWS
add test file for Skype and add test for the tcp message. Move the regex parsing into a static method so its easier to test. Fixed the regex for multiline message
Updated HTML, CSS, and JS files
linking to images failed corrected.
Navigation reworked, Issue #14, using _before for breadcrumbs and a setter method on the event controller for the admin navigation.
Show testrun results on submission_show
Line wrapping in pre tags
FIX: Wrong texts if submission is not active
Template namespace change
Style in tmpl_context and testruns are already attributed
Hottest of hot fixes
Warn teachers when judging prematurely.

If the assignment is still active, teachers will see a warning reminding
them of the possibility that the student could still edit the
submission.
Fixes #96 but still leaves #95 up for discussion.
added garage door opener demonstration code
page flip integration
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
merge({'foo':1}, ({foo:{'bar':123}}))  => {{'foo':{'':1, 'bar':123}}}
[#2407] lint and test fixes.
[t1289] proper removal of listeners on destroy
Merge pull request #350 from secretrobotron/t1289

[t1289] proper removal of listeners on destroy
[#2896] destroy and hide first run popups using the tooltip api to avoid errors if the callback somehow executes twice
[#2034] Remove photo plugin from basic template, delete plugin code
[#2456] Fix Super Scroll Bar positioning
Bug 2866 - Enable use of secure Flickr API endpoint
Embed locale.properties in the viewer.html for extension
Keeping l10n.js file reference; removing temp/unused files
Initialize default Rails app. Fix .gitignore from auto-generated copy.
update bootstrap to v2.2.0 keeping the custom changes in bootstrap.css
Remove whitespace from xml config files
Merge branch 'master' into replication_both

Conflicts:
	multicore/gene_autosuggest/conf/solrconfig.xml
	multicore/main/conf/solrconfig.xml
	multicore/pipeline/conf/solrconfig.xml
Another fix to adapt to exogenous variables.
Prettier recent thumbnails page.
Merge branch 'master' of ssh://camlistore.org:29418/camlistore
reduce some logspam. still a fair bit around images
Permanode selection (and range selection, etc)
Prevent browser range selection
file embedding: enable compression (mainly for
large .js files).

We will need this when we start getting large js
files generated when using the closure library.

Change-Id: Iaecacd54c3d08637918b1afd420fb90f1a84aabb
Merge "file embedding: enable compression (mainly for large .js files)."
Fix mymysql for Go 1.1; see https://code.google.com/p/go/issues/detail?id=4476

Change-Id: I6b5d66b68715f7d71ce665dbf90dfc0d4eefab5a
Merge branch 'master' of ssh://camlistore.org:29418/camlistore
auth: fix nil dereference crash

Change-Id: I4552829da795236b9c875a753b6f1d710066d89a
reformat javascript with consistent indent

Change-Id: Idc70d6959b3708bc3b5893dffeaebd9950016ab6
Ignore OS X noise.

Change-Id: I75fc2e3fd2a83ba47c91aa9b483abb07371873e4
Forgot to make embeds

Change-Id: Ib90ba363ce740549be0cd7e22f20437d1396b0ff
newui layout, only for dev-server use for now.

Change-Id: I0e77b8088b2e04fd56e017678cb6e0a476b10682
buildbot

Change-Id: Id61f5370258a00d03fd25c395205000af9e0db3b
manpage: various fixes
configure: remove --enable-profile

The --enable-profile switch simply adds -p to the CFLAGS, which enables
gcc's extremely worthless "prof" profiling support. This kind of
profiling is broken on the conceptual level and thus harmful, and even
if you want it, you can enable it manually with --extra-cflags.

Also remove $_march $_mcpu from the CFLAGS code. These variables were
always unset, as the code setting them has been removed earlier.
options, vo_x11: remove -zoom option, make it default

The -zoom option enabled scaling with vo_x11. Remove the -zoom option,
and make its behavior default. Since vo_x11 has to use libswscale for
colorspace conversion anyway, which doesn't do actual extra scaling when
vo_x11 is run in windowed mode, there should be no speed difference with
this change.

The code removed from vf_scale attempted to scale the video to d_width/
d_height, which matters for anamorphic video and the --xy option only.
vo_x11 can handle these natively. The only case for which the removed
vf_scale code could matter is encoding with vo_lavc, but since that
didn't set VOFLAG_SWSCALE, nothing actually changes.
vo_opengl: remove osdcolor suboption

This wasn't actually used since the old gray-alpha OSD rendering has
been removed. Removing the documentation for the vo_opengl_old osdcolor
suboption was forgotten as well.
video/filter: rename vf_eq2 to vf_eq

vf_eq was deleted earlier, which makes the name vf_eq2 even more
awkward.
options: remove --osdlevel in favor of --osd-level

--osdlevel has been documented as renamed/removed. Not actually
removing it was probably an oversight.
options: rename --xineramascreen to --screen, remove magic values

--xineramascreen=-2 becomes --screen=all
--xineramascreen=-1 becomes --screen=current
options: remove --display

Was used to set the X11 display. XDisplayName(NULL) does the same,
using the DISPLAY environment variable instead.
options: respect --no-msgcolor during early program start

Using --no-msgcolor, error messages that happened before "really"
parsing the command line were still printed in color. Add the
CONF_PRE_PARSE flag to make this option take effect as early as
possible.
скрипт преобразующий json карту в plist карту для игры DigKing
connect each loop and close
minor doc updates
added TLC5940 example
move to unsafe memory access for speed
Use set/clear registers for digital output
- no jump of html
Switched to simple.Mocking 2.0.0.1.
updated readme
Merge branch 'master' of github.com:mtully/gitsome
Moving thrift-generated sources to the better package
I don't why the former build file is not removed from the tree
add separate config file
Update demos/demo3.cpp

You need to create QTimer instance, and connect to its timeout() signal. Single shots works only when event loop is started (app.exec).
Merge pull request #15 from mofr/patch-1

Update demos/demo3.cpp
Added Active directory groups integration
#13 added namespaced @Id mappings
Add silicon, and fix some bugs that came with it.
Add sampler type.

git-svn-id: http://izanagi.googlecode.com/svn/trunk@217 05d2ca3c-aac1-175a-b4cf-4be6c0a525a7
Fixed some bugs for CubeTexture.

git-svn-id: http://izanagi.googlecode.com/svn/trunk@218 05d2ca3c-aac1-175a-b4cf-4be6c0a525a7
- Remove some codes by preprocess.
- Fix a bug which is moving pointer address.
- Add new GetTrans function.

git-svn-id: http://izanagi.googlecode.com/svn/trunk@219 05d2ca3c-aac1-175a-b4cf-4be6c0a525a7
Add CubeMap sample. But it does not render correctly.

git-svn-id: http://izanagi.googlecode.com/svn/trunk@220 05d2ca3c-aac1-175a-b4cf-4be6c0a525a7
Move ftdetect configs for ruby to .vim/after/ftdetect/ruby.vim
"is python faster than shell?"
"improved search and cache setup"
"implementing models and controller"
add value getter to column
unknown command event
Delete procfile to get Heroku to accept push:
Make migrations happy
Fuck it
Force SSL in prod
Fix ssl module
Clear closes_at if republishing
Add pry
Remove OpenID support
sfx + quality check
final version, missing music
Minor changes to our drop down menus

Now use non-selectable opt groups as the head items
fixes to xmlexport
Correcciones de patient
Added copy constructor for Board
Minimax with alpha-beta, overall WIP

Need to implement Board.getCellCount, Board.scoreBoard
WIP: alpha-beta with bug in static eval?
Simple minimax, no pruning

Also changed Client to accept an AI, be Runnable, and fork two threads
so that we can test strategies against GreedyPlayer
Separate report function

Makes console output much more sensible when playing two clients
Second player is minimax
Board representation was flipped
Working vanilla minimax
Alpha-beta implementation, maybe broken for min player?

Can't tell, I'm still going to need to calculate some game trees
Set default depth of minimax to 6
Bugfix: client was sending NO_MOVE twice
scoreBoard gives extra weight to victories
Working alpha-beta implementation
Alpha-beta now default second client
Merge branch 'topic/alphabeta': making Jafar competition ready
Sooooo many graphs
libshcroedingerdec: Changed AVPicture to AVFrame

libschroedingerdec: Use SchroTag to store pts

libschroedingerdec: code make up

libschroedingerdec: Solved memory issues
Todo Page added for paths that are currently missing
first draft complete - probably need to work on fonts
font-weight is now fixed to 300
Merge pull request #6 from g8kay/master

theme id 66b2d258-c198-4331-b992-2fed7051d12f
added first router test, conflicts with some app tests so had to comment them out for now.
Update doc to codo 0.6.0
Fix link selection for parent tree nodes. (Fixes #35)
Make the frames view the default. (Fixes #30)
Add a minimalistic table style.
Images added for Icon Courtesy of Jansen Palanox
apply markup editpost
apply markup newPost
taskBoard test datas and client models
* fixed a bug of in_top_scope()
* update documents
Posting a new comment would now return a CommonReturnObject.java instance which has the ID of the new comment
asdaj
Added ability to have both positive and negative connections, and related changes
Safer check for sections in config file
Updated for pos and neg connections
Update Make dev-deps
Changing the name of the course on the homepage to "Python" as a topic. Later the user can switch between topics and possibly courses.

For now, having a simple Python title seems easier to understand for the user.
Refactor REPL
Removes unused files
Initial commit
replaces cout with qDebug
Stuff
Merge origin/0.1/alpha-3 in 0.1/alpha-3
reading group
Update README with a better description and examples links.
ability to search readings in the last minute or hour
finished it first go
Hopefully permissions on ShareRepository git will work
change the app/model/user.rb
change the validation users
workaround for https://github.com/pypa/virtualenv/issues/330
Merge pull request #70 from mozilla-services/workaround

workaround for https://github.com/pypa/virtualenv/issues/330
A Skeleton of the program

main method is in Skeleton while the transformations, scene node, and
shader source setups are set as include files
Update Library/Formula/maven.rb

Updated url to new url structure for getting the binary.
Updated API notes.
implement irc_string, a case insensitive string which implements the IRC finnish case rules ({}/~[] etc) - use murmurhash3 for hashing it
Controller class name must be in format: Name + Controller, file name must be the same as class name.
Handle additional Parameter that should contain appname.hostname for better grouping of values by app and server
worldview would destruct properly if the tool didnt segfault on close
tons of indentation fixed
added player number labels, pretty sure field flipping is still right
field scaling will be intelligent, once master is merged
Merge branch 'master', remote-tracking branch 'nbites/master'
got rid of some resizing stuff before merging
think I fixed most of the merge conflicts
merge conflicts all fixed, player numbers working
fix merge conflicts
merge
Merge branch 'master', remote-tracking branch 'nbites/master'
merged Octavian's stuff (again)
octavian's stuff broke player numbering
player numbers, changed field scaling, hopefully won't draw off field now
heading works better, and uncertainty isn't drawn if its stupidly large
Performs full goalpost pan
fixes cmake defaults
fixes shuffle bug
cleans up Transition file. Makes printing work right
fixes kick printing
60초 제한이 과하다는 의견이 있어서 10초로 기본 값 조정
2.0.5 - 삭제된 쪽지함에 출처 없는 쪽지가 있을 때...

복구 안된다고 오류 메시지 날림.
added new openhome build structure to ohXen
fixed merge conflict
Add ol.Map.isDef (not yet working correctly)
Update notes for submitted changes

* A new documention structure, ready for contributions
Remove topic from scheduler run_instance.

This argument to run_instance was unused, so just remove it.

Change-Id: I42366514285a2355f647c776af140effc1618b7d
Merge "Remove topic from scheduler run_instance."
Avoid error during snapshot of ISO booted instance

Fixes bug #1023492

If you boot an instance from an image with disk_format=iso and then
attempt to snapshot (i.e. nova image-create) you currently get a
traceback because we do:

  qemu-img convert -f qcow2 -O iso -s $snap $disk $out

and 'iso' is not a format that qemu-img knows anything about.

When booting the image, we use qemu-img to detect that the file is
a raw image so we avoid having to special case disk_format=iso
there. However, there's no way of avoiding the special casing when
extracting a snapshot.

Note 1 - it's not very clever to take a snapshot of a read-only
disk downloaded from glance and upload it back to glance again.
Adding such smarts would be a nice enhancement.

Note 2 - only the destination format is important here because
we can only be extracting from a qcow2 image since snapshots
only work where use_cow_images=True. See also #1030844.

Change-Id: I21ff6db8ebb59a83d27f224283fb76f582c38a0e
Merge "Avoid error during snapshot of ISO booted instance"
Update notes for submitted changes

* Improve nova-manage usability
Fix db calls for snaphsot and volume mapping

 * Fix misuse of project_only
 * Includes failing tests
 * Adds missing call to db/api.py
 * Fixes bug 1017816

Change-Id: I993089ba031a05e7ab0ea91c279a2ac47593eda3
refactor libvirt from connection -> driver

part of bp:virt-driver-cleanup

part d) of the blueprint is to get rid of the connection terminology
and use driver instead. This does this for the libvirt driver and
associated tests.

Also add LibvirtDriver import to __init__ so that
nova.virt.libvirt.LibvirtDriver can be used as the compute_driver
string

Change-Id: I13c701c390784fa1f7809705741abb46e40973be
Merge "Fix db calls for snaphsot and volume mapping"
Merge "refactor libvirt from connection -> driver"
Ensures compute_driver flag can be used by bdm

Fixes bug 1063851 by moving compute_driver flag from
compute/manager.py to the global flags.py

Change-Id: I06891fd65550b63ffe83da18b6af41cf46938667
Merge "Ensures compute_driver flag can be used by bdm"
Update notes for submitted changes

* Upgrade pylint version to 0.26.0
fix unmounting of LXC containers

There were two issues here.

1. There was a global object stored for all instances,
thus the last mounted instance was always unmounted.

2. Even if there was only a single LXC instance in use,
the global object would be lost on restart of Nova.

Therefore we reset the internal state for the mount object,
by passing in the mount point to destroy_container(),
and querying the device in use for that mount point.

Fixes bug: 971621
Change-Id: I5442442f00d93f5e8b82f492d62918419db5cd3b
Cherry-picked: a5184d5dbf67630dac3abb69b1678b60807cfce7
More meaningful help messages for libvirt migration options

Change-Id: I08f4724a7ef664cfebba57c5c9495494853289a8
Reference: http://libvirt.org/html/libvirt-libvirt.html#virDomainMigrate
Added current implementation (out of date) of Yabe.
TODO notes
TODO notes
Refactored: removed unnecessary call to close()
Expose failure state from TextUI
JumiBootstrap: fail if there were errors