labofsahil/github-event-dataset-2012 huggingface dataset:
Revert "busybox: fix last commit, thanks to vpeter"

This reverts commit 40824b50e03ed431bcb8c27dda74a6c41bcf52b2.
scripts\checkdeps: APT-Support and checks for "sudo" on Debian ... this fixes Issue #1482

Ubuntu:
Checks if Aptitude is installed. If not, the user will be asked if he
wants to install the packages with apt-get OR if he wants to install
Aptitude and start the process again.

Debian:
Sudo is not installed by default. So the script checks if sudo is
present (maybe installed by the user befor). If not "su -c <command>"
will be used.
xbmc: update to xbmc-ae04d99

Signed-off-by: Stephan Raue <stephan@openelec.tv>
alsa: remove sample configs, most of them are not needed anymore with XBMC-12, we will see if we must readd some of them again

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge pull request #1499 from klopsknoedel/master

checkdeps: APT-Support and checks for "sudo" on Debian, this should fix #1482
pcscd-addon: update changelog
oscam: update changelog
xbmc: update to xbmc-5417cfb

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
hdparm: set standby time to 15min

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge remote-tracking branch 'upstream/master'
Fixed pc recipe
Fixed battle bug on switching
Fixed duplication on gaining multiple levels over evolution
think i needed to remove shiny texture preloading to get the check to
work
[TASK] Improve rendering of Button mode in Widget
[DOC] Remove manual which has no purpose
haku toimii taas vaihteeksi
Fjerenet flere parametere. Gjort hele progressbarController statisk
add ul_strlib_x.h, modify readme
Fixed writable Pagoda Box dirs
mkdir
mkdir
Ignore mkdir error
Made var files writable
Fixed composer dependencies
Compatibility with old Redis version
Documentation fixes
Added toXml method for POI

Fixes #74
Refactored default config
Added Transport\Entity\ScheduleSection
Responsive connection search
Fixed spacing
Avoid Zoom
Experiment
Flat table
Spacing
Duration
Hide and seek
Use touchstart
CCParallaxNode offset adjustment

Added ability to adjust an offset inside of a parallax node.
Optimizacion de vistas y envio de variables
Estilo de las Lineas del Listado
Estilo del Footer
Copyright
Updated config with the correct base settings
Application class + (function: loadTexture + loadShader)
icon added

Signed-off-by: Peter Link <mr.peterlink@gmail.com>
fix phd project
audit, cracklib, fonts-tweak-tool, gtkspell3, inkscape, kde-telepathy, kernel-custom, libtorrent-rasterbar, nss, opera, pulseaudio, python-lxml, swig, transmission, udisks2
Fixing more open tags
PSA Election results news article and updaing bylaws, governing board, and history pages
#11 Modules
- if file exists Modules\ModuleName\views\menu.phtml display content
updated to use latest csi library
Merge pull request #32 from Postmedia/responsive

updated to use latest csi library
Added line in Update File

Signed-off-by: emericask8ur <sk8tj@yahoo.com>
Minor changes for application.js to reflect changes to Phoenix Core.
+ asteroids
Added fancy rounded corners to the cube
moved prefix into JS
cleaned up demo blurb
Fixed some stuff about entity metadata wrapper
updated admin/module services
Simplified paths and added some dotfile functions
Fixes pinging on api v2.
DB/SAI: added Westfall zone scripts
DB/SAI: added Duskwood zone scripts
DB/creature_addon Fix error consol
DB/game_event Fix error consol
Fix error consol
Core/Auras: Implement CheckAreaTargetFunction and AuraDispelFunction.
Removed h1, reformatted code layout
changed Hubot name to Scrappy
Merge branch 'master' of github.com:ScrappyAcademy/hubot
Heroku Commit
Heroku Commit
Finish Demo App
Exits with exit code of 1 on any error

This commit replaces all existing exception handling to allow errors to flow
up to the global handler.  This ensures that any error will get caught by the
global error handler and cause bundler to exit with a non 0 exit code.  This
causes a problem with the VS extension because it is not correctly picking
up the writes to stderr.  The bundler extension still does everything else
correctly.
Merge pull request #27 from NickLarsen/master

Fixes issue #24 part 2, eliminate all existing error handling and just use global exception handler
no message
Merge branch 'master' of https://github.com/Shonof/bredapp-merge

Conflicts:
	BredApp/BredApp.xcodeproj/project.pbxproj
	BredApp/BredApp/AppDelegate.m
- Added start action.
- Improved neobundle source.
Large SPN to avoid issues with some Network providers

Patchset1 : Fix tabs

Change-Id: Ib9e2a29a9c693f6d7e5feb0c62f97a8a312916f1
Liposuction - part 1

Change-Id: If74dbe95b808c47f3abfdafeb0934e84be81aa3d
Upgrade to latest sd4j api; ensure EpgClients are properly closed
add the evaluation result analysis to the abstract
Gave the clock_array iterator a more clear variable name
Not sure how this got in there.
dodane testne sekvence 5
Version 3.0!!!
Java program update1
Making WotLK less WotLKy.

Signed-off-by: sycantha <bryan.mayer26@yahoo.com>
IIFE to every test file
Added functionality to ImportExcel Button
Added import Excel to UnitOfWork
Finished implementing import excel
Merge branch 'master' of git@github.com:Systemic33/Intracker.git

Conflicts:
	InventoryTracker/AdminForm.Designer.cs
	InventoryTracker/AdminForm.cs
	InventoryTracker/UserService.cs
Setting up Game and Player models.
- Began refactoring SPSTF
commit the updates to the text files and seeing if the swap file
will go away,
Organize the lua a little better for playing movies.

Do not go through the ui/game_ui layer for playing.
Movies reserve sound effects channels

Without this patch THSoundEffects was not aware of which channel THMovie was using and clobbered it when it tried to play something like the announcer message.  This exposes the methods used by THSoundEffects to reserve and release channels, then uses them in the movie_player to grab safe channels.
Remove singleton from THMovie
Support scaling to arbitrary sizes.
Full screen movies
Fixed torch location
Fix normals for the terrain heightmap generation
Ported "Count misreads in the test framework and track. Retune slightly
on this basis to pick up a few more images"
IRC test server
Add small test for libretro.
Enforce static on globals that aren't used outside.
Do not use assert() as error handling.
Merge branch 'master' into rgb565
(Xbox/360) Changes for interoperability
(RARCH_CONSOLE) add core resolution (use aspect ratio provided by the emulation core)
Refactor texture init.
(360) Fixup
Fix a use-after-free when collapsing the tree in choose mode, from
Carl Henrik Lunde.
merge_proSoar.conf: don't merge Gettext.js
Changed Website Directory
Ignore PyCharm .idea
Using LGPL 3 as license
suite install & first test post
Probably should leave that uncommented ;)
Changed string associated to NO_CATEGORY from null to empty
Did this to avoid nullpointer when looping through catgory names
Adicionando a documentacao na pasta Documentacao e atualizando os projetos
ISO Form Panel now has a dropdown box that pulls its values from CSW records instead of being hard coded
Added another child record example, waters
Refactored calval scenario loading into the parent store directly
Because of the reorchestration of how stores are loaded on the front end, had to juggle around how to unhook the load listener
Updated child CSW store to hold an object that connects the calval scenario to the WFS link
Added validation to the upload panel to check that a file is selected
removed tomcat configuration from pom
Option pages tree: Ensure the "Playback" root doesn't show twice (once
translated, the other not) after 2fc82a75541fed60439f1472402a4a8d26483689.
Translation scripts: always create a backup of the files before launching the scripts.
Update the error message shown when trying to load a subtitle with an unsupported renderer.
Add madVR to the list of renderers compatible with the internal subtitles renderer.
add gettext macro for messages
add gettext macro
temporary return old LINEs definitions
add gettext macro
remove gettext macro for debugmsg
add gettext macro
add gettext macro
add gettext macro
add gettext macro
add gettext macro
add gettext macro
add gettext macro
add gettest macro
add gettext macro
add gettext macro
fixed block change (again) and implemented multi block change
Removing superflous echos
maybe prettyPhoto will work
got json serialization to work finally
Now use Escape to change combat mode.
Add function RSS::secureTag for special characters bug
Changed some css for the info window. Made the name of the business
into a link.
Added metrics v1
Created alternate versions of several enemies for use in Final Boss Fight. Fixed Boss Two so fixed harpoons die when boss dies and respawns when boss respawns. Bosses have longer death-duration for greater epicness
Implemented level queue so enemies do not spawn at same time. Enemies now immediately pathfinding after spawn. Implemented spawn points for certain levels. Fighter bullets no longer die when hitting each other.
Added bonus star system when player kills certain amount of each enemy. Made UI improvements to game over screen
Added topbar and cleaned up interface. More work on levels up to 1-6
- added composer.jons
- fix previous commit
- fix previous commit
- fix composer.json
- added debug mode enable on/off
updating composer versions & channels
Merge remote-tracking branch 'origin/master' into hybi-16

Conflicts:
	lib/ElephantIO/Client.php
Fixed NPE in notification when using the none pseudo-account.
Added currency name on the sign (not tested yet)
Build (not tested probably)
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	PaidSwitch.jar
	PaidSwitch/build.version
fully operational Renew button, added to views for input and display, still need to define max's for categories and implement inheritance to equipment models when set to NIL in the model
Séparation Menu
some tweaks to vagrant file to increase memory and new box urls
Remove -m32 from LINK/COMPILE_FLAGS
Fix possible crash after doing halt()
Refactor local variable name to match member
Preserve STK and HEA across public calls
Started work on Emeralds from killing mobs.
Dzialajace okno z ustawieniami. Spenienie punktu 7 i przygotowanie do punktu 5.
Time taken for each stage to complete is being logged separately.
Updated pagination in Commands.jar
Static Pages Software Solutions and Other Solutions
Logging
Merge pull request #31 from sachinrk/master

Logging
Added a reference to the wiki into the documentation.
Disabled a simple test case.
Read all bytes at once in getShort and getLong.
Added screenshot and icon to README.
Reorganizing files for use inside Eclipse
New version which I don't like at all using optical flows
Masking
Adding first working version based on diff and gaussian filter
Removed HelperMethods check as seemed to be causing load failure
Small update to rainbow.
Amended gemfiles for Travis
Centered frame on screen.
added an invoice factory
added some invoice specs
added invoice model, controller and views, amended application view
working on preview menu
Correction d'une erreur de frappe
Création des getters et des setters des participants
Ajout de la methode setList()
Création du main et premiere rédaction
Fix admin abilities and make them more explicit
Merge branch 'authorization'
Modified params_to_hidden_fields to handle arrays of values
Merge branch 'master' of github.com:reInteractive/toolkithq
Refactor Ability calculation
Merge branch 'master' of github.com:advisorshq/toolkithq
Added notes on functions
Remove debug code, forgotten in last commit
ajout période dans apis
ajout définition api PAPRICA
ajout dépendance envers paprica
ajout configuration PAPRICA
changements api epmsi
ajout API MAT2A HAD
tmp for osx
MEDIUM : EMF Integration (WIP)
Merge remote-tracking branch 'github/new_flexo_ontology_layer' into
new_flexo_ontology_layer

Conflicts:
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/technologyadapter/FlexoMetaModel.java
	flexodesktop/model/flexofoundation/src/main/java/org/openflexo/foundation/technologyadapter/FlexoModel.java
	flexodesktop/technologyadapters/emfconnector/src/main/java/org/openflexo/technologyadapter/emf/EMFModelSlot.java
	flexodesktop/technologyadapters/emfconnector/src/main/java/org/openflexo/technologyadapter/emf/EMFTechnologyAdapter.java
	flexodesktop/technologyadapters/emfconnector/src/main/java/org/openflexo/technologyadapter/emf/model/EMFMetaModel.java
	flexodesktop/technologyadapters/emfconnector/src/main/java/org/openflexo/technologyadapter/emf/model/EMFModel.java
	flexodesktop/technologyadapters/emfconnector/src/main/java/org/openflexo/technologyadapter/emf/rm/FlexoEMFModelResource.java
IMPORTANT / Ad-hoc conversion script (project clean-up) developped in
the context of Thales SEPEL-NG project (corrupted projects) / Should be
removed from public distribution
LOW / Debug / LoadDocX
Merge branch '1.4.5' of ssh://git@github.com/agilebirds/openflexo into 1.4.5
Added option to build Java language bindings
Make profile photo so it's not oddly sized
add New operation in File menu
Deleted flash html.
WEDSITE > Dev > Adding Honey Fund to website
Initial Version of the Package
Site updated at 2012-05-13 20:01:31 +0800
Update src/server/session.coffee

callback is not defined, removing it
Merge pull request #126 from dcolens/patch-1

callback is not in scope
whitespace
failing test for opening a document after closing one
listen for 'disconnected' not 'disconnecting' to match changes in commit 692865c
clean up test
uncomment webclient tests
Merge pull request #127 from rburns/close-doc-not-cnx

"disconnected" event misnamed

Also:
- whitespace
- clean up test
Updated webclient
Add (optional) authentication step when connecting to shares

share.open() now accepts an object instead of a origin string, The object can contains an 'authentication' property which will be attached the user agent. Use this to store an identifier for the user e.g. OAuth token
Fixed tests with auth msg, added new tests for authentication object and timeout
Support old format of origin string in argument to sharejs.open()

This fixes the client tests too.
Added support for Mongo auth and passing in client

can now pass `user` and `password` in options to authenticate to
mongo database.

can now pass `client` in options, where `client` is a mongodb.Db
instance, and mongo driver will use that client rather than generating
one from the options.
authentication now occurs after client properly opened
exposed action.responded to authorize() function

responded was a private variable used for determining if the authorize()
function had called action.accept() or action.reject().

responded has been made a public attribute of the action object so the
authorize function can check to see whether it has called accept() or
reject(). This is useful for complex control flows.
Merge pull request #132 from dgreisen/auth

expose action.responded to authorize() function
authenticate() can pass error message to client through reject(msg)

Now the authenticate() function can pass a custom error message to
the client by providing the message in action.reject(msg).
originally, rejection resulted in an unchangeable and not particularly
useful "forbidden" error.

includes tests
Merge branch 'auth2' into orig

Conflicts:
	src/server/useragent.coffee
Merge pull request #133 from dgreisen/auth2

authenticate() can pass custom error message to client through reject(msg)
Merge pull request #128 from daredevildave/master

Add (optional) authentication step when connecting to share servers
numbers sample refactor (names, arguments..)
Damn. Back to C-* for tmux window switching.
cleanup of books and talk page
added checkmark for notes close/open
Primera iteracion de Productos Listado - Detalle - Muestras Gratis - Boletin y Contacto
Adding the order functionality
Slider
Background
Modal window styles modified and finished
[upgrade] Added bunyan log tool
[upgrade] Added bunyan dependency
[upgrade] Added bunyan logger to the top layer of nodester
[upgrade] Fixed regExp on render error pages and added bunyan logger support
[upgrade] Fixed|CleanUp lib/app.js done
[upgrade] Fixed|CleanUp proxy/proxy.js
[upgrade] Added proxy.conf support to respwan process
Chapter 8 will get done... eventually.
Merge branch 'master' of github.com:alethiophile/KBDH-VN


Signed-off-by: ZZZZ ZZZZ <Zfish9@hotmail.com>
We can haz ikyon.
Added some Kanaetude.

Signed-off-by: Agasa <megamanx20042002@yahoo.it>
Merge branch 'master' of https://github.com/alethiophile/KBDH-VN
cleaning up The enum (need to find a looser coupling between the enum and the impl classes, ie processors)
adding support for cache powered by redis, woo-hoo. however, the support is only on mysql side for now
before I start, lets add var that = this; everywhere. should be a habbit already, meh...
updating create, update and remove - the easy ones
get method now; damn, one of those moments when Id give anything for few good unit tests :-)
and now the list; testing next
making rest api use mongo
oopsy, this that thing again
fixing the itemResult refe
now we have configurable cache and expirations per items
too much of the logging; especially for cache values, we dont really need it
big commit with a bunch of stuff; css and javascript, new root route, favicon, install cancan, upload tunes
add check digital signature
chapter 5 exercises
Ch 6 done, Make a basic User model (including secure passwords)
ch6 exercises done
Finish user signup, Ch 7
add SSL in production
ch7 exercises done
Finish sign in, ch8, no cucumber
Add null check just in case OSGI has taken over everything
AS7-5276 Check for null content repo
[AS7-5253] clear transformers registry
[AS7-5132] increase connection timeouts
acquire ControllerLock in the restart-required handler
Bump version to 0.6.0

This adds the ability to delete all documents from an index.
development merge / least divisor
Merge branch 'master' of https://github.com/alternatex/spreadson
Make PatientsInforDisplay be part of Primum portlet
Make PatientsInforDisplay be part of Primum portlet
Fixes #24 & #25
Remove document metadata
Upload images
Fix misspelled name script
Fixed item entity physics
Updated most blocks that require support
Dropped items can now be picked up
Added most item drops
Added jump detection for players
Cleaning up jump mechanic
Added falling damage
Fixes that lightnings could not correctly be spawned in height > 127
Update README.md
Updated to 1.4.5
Update to 12w49a
Added 12w49a items
Fixed bug with item drop metadata
Merge branch 'master' of github.com:SirCmpwn/Craft.Net
Updated to 1.4.6-Pre
Updated README in preparation for 1.4.6 release
Turned off physics for player entities
Progress on making item drops work for 1.4.6
Merge branch 'master' of https://github.com/SirCmpwn/Craft.Net
Merge branch 'Snapshot' of https://github.com/SirCmpwn/Craft.Net
fixed logout link, tweaked post listings
better font stack for the poor none mac users
commented a require
NMAP installer

Stub installer, now just a wrapper around yum.
OpenVAS module

Code for OpenVAS, disabled SELINUX
link header formatting
Update capistrano deploy file to use the read-only repo from github.
Added Finnish and Spanish
updated translations
fixed icons
Subject:Completed with Edit Organisation Details

Description:
1. Added Prefereneces option in menu page and added one more option
   to Preferences ie. Edit Organisation Details
2. Added delimeter for all amount field
3. Fixed report type bug
4. Added minor changed in create voucher layout
Add template files to watch task
upgrade to AngularJS 1.0.0rc8 blooming-touch
Initial kohana cms framework
removed debugging try/catches
Primeface 3.3 Snapshot and Add PrettyTime
premiers essais
Twitter Timeline
Ca commence à ressembler à quelquechose
Bouton favorite OK
Bouton Retweet et réponse KO
Twitter Timeline
Twitter Timeline
Remove tabs for Mentions & Favs
back to maven.compiler.plugin 2.3.1
Twitter Timeline
Twitter Timeline - MultiTimeline via Onglets
Merge pull request #1 from gbougeard/master

twitter timeline by gbougeard
CancelInvite
remote_slid on playsms_gatewayNexmo should be varchar(40) not int(11)
remove unused field gender, marital and education from user pref
remove unused variable trn, up_trn. trn is an option for sending without footer, we will think the best way to do this later
build: Add kernel-building as part of the process

Kernel image integration is now done in the build system. The "one true way"
of doing this is to download the kernel source into kernel/TARGET_BOARD_PLATFORM,
and defining the TARGET_KERNEL_CONFIG variable in the device's AndroidBoard makefile

Optionally (or as an alternative), a prebuilt binary can also be defined at
AndroidBoard, by usage of the TARGET_PREBUILT_KERNEL variable. This binary
will be used if the kernel source is absent (or undefined). A complete
AndroidBoard.mk should look something
like this:

TARGET_KERNEL_CONFIG := cyanogenmod_<device>_defconfig

TARGET_PREBUILT_KERNEL := device/<vendor>/<device>/kernel

Change-Id: I8634fa4c788a42dc6f62e62ca170825b66db126a

existz:
- Modified to use TARGET_BOARD_PLATFORM instead of TARGET_BOOTLOADER_BOARD_NAME
added authentication-in-angularjs
Missing include <sys/systm.h>.
Correct a comment.
fix some bugs.
Pull in <sys/timepps.h> here so that other things that include comvar.h
will compile.
Separate syncing the I-stream from invalidating the translation buffer.
Remove unused message.
Significantly reduce the number of I-stream synchronizations by really
decoupling this operation from TLB invalidations (e.g. pull I-stream
syncs out of loops, executing them only once, etc.).
Define a software PTE bit to track VM_PROT_EXEC.
Define a macro to test PG_EXEC.
Garbage-collect the old PMAPSTATS stuff; it didn't compile, and should
just be redone from scratch.  Get it out of the way now to make it easier
to restructure a few things.
hallelujah! We finally put PR#2008 to rest with this.
add magma, note that power now works, add references to driver man pages.
convert some nroff stuff to mdoc(7) stuff.
fix some errors, clean up for nroff
Don't call isa_dmainit() when NISADMA == 0.
Fix typo.
mdoc(7) & nroff cleanup, plus some additional references
Add some function decls previously declared elsewhere??? While here make them
static.
Per leo@netbsd.org: Don't call isa_dmainit() if NISADMA == 0.
mdoc(7) & nroff cleanup, plus some additional references
Adding configuration file for Travis CI
Minor test modifications
Trying to get more tests passing on Travis CI - see https://travis-ci.org/NeuralEnsemble/python-neo
Some code cleanup in TaskPlanningPanel. Began implementing course and task dialog windows
Initial course edit/add dialog
Added B menu button to pull up shop screen
change devconnect branch to 7.x-4.21
with bootstrap and less
made change to refresh data
Tiny typo, I didn't notice before I commited and with everything else, I didn't end up testing it.
Initialize the gitHub repository
clean build config script
Site admin should be able to view/access any collection.
LevelSelector will start on current page
Bug fixes
Will start on first page by default
A few more instructions on the readme.
Active Button bounce effect implemented
Visibility check fixed
Code fix
New utilities
Bug fix
New filter functionalities
Merge branch 'master' of github.com:asantee/ETHFramework into globalscale
nightly update

git-svn-id: https://firebird.svn.sourceforge.net/svnroot/firebird/firebird/trunk@57393 de594faa-8d1b-4a0c-9a6a-a7de5f8bf859
Fixed CORE-3992 - No records in the table rdb$dependencies for ddl trigger.

git-svn-id: https://firebird.svn.sourceforge.net/svnroot/firebird/firebird/trunk@57396 de594faa-8d1b-4a0c-9a6a-a7de5f8bf859
Implemented CORE-3994: Improve the limbo transactions scan at the end of the sweep.
Also, fixed the mistake in the refactored code (see the first change in the diff).

git-svn-id: https://firebird.svn.sourceforge.net/svnroot/firebird/firebird/trunk@57399 de594faa-8d1b-4a0c-9a6a-a7de5f8bf859
Трололо коммит

Всем спасибо !
OS-1676: 'json -h' output has incorrect link to online man page
OS-1677 Add unmodified node-dtrace provider (0.2.2) db13b0aeafc1db58c756ee4d9ed65b808a6b700c and libusdt 8ab25b6e5d32afc9147890ba80b1e99a4102717e
OS-1677 Add Makefile sections for node-dtrace module.
OS-1680 update node-dtrace provider to 3336f6ebd2fc73c6cfd4d09be3d80a5716aace8d (0.2.3)
OS-1441 routing-setup service provides no useful log output (move method from illumos-joyent)
OS-1441 routing-setup service provides no useful log output
Revert "OS-1441 routing-setup service provides no useful log output (move method from illumos-joyent)"

This reverts commit 6687aad2cdfeabaec4f3d6a57931c0d3b805db36.

Conflicts:

	overlay/generic/lib/svc/method/net-routing-setup
smartos-live#114 imgadm should send Host header in HTTP requests
OS-1684 fix vmadm display of delegated dataset when mountpoint has been changed
OS-1633 add support for 'snapshots' listing in VM objects in VM.js
smartos-live#133 fixed issue deleting KVM VMs with snapshots (thanks calmh)
OS-717 apix code induces hangs
OS-1695 fix IP address of datasets.joyent.com now that old one was deleted.
OS-1628 tools/build_illumos should not pass -i
OS-1627 smartos-live ./configure needs some love
OS-1685 dboot should check boot archive integrity
OS-1671 add support for /.smartdc_version file which will indicate the SDC branch we're runnign under.
OS-1710 Expand mdata:execute to handle the /var/svc/provisioning flag file. Make sure the mdata.xml file is added to the 'joyent' brand too (just disabled, to be enabled by zoneinit).
OS-1710 add missing manifest entry for mdata-execute script.
OS-1714 update to json 5.1.1 for jsontool#42 fix
OS-1717 bump mdata:execute timeout to 300s from 60s
Merge branch 'master' of git://github.com/joyent/smartos-live into ec

Conflicts:
	src/sysinfo
working on scripts
Merge branch 'master' of github.com:ateston/giorgio-2014
added units module
fresh rebar.
R15 is the new future.
Poolboy POC.
Flow as a list.
File iterator.
Poolboy will never flood clamd, clamd_stream can.
only use brand title in clip OD output
tweaked images on forms
forgot to add end
removed comments
fixed news typos
Fixed lots of issues that did not save properly last night.
Cleaned up so db stuff
Changed names according to the main site
Code added
doneMerge branch 'master' of github.com:awijeet/learn_deploy

Conflicts:
	.gitignore
Innan Uppgifter
Removing amount & scrapbook ideas
since there is no guarantee that
cancelling a request => success/fail block will not be called,
you shouldn't nil out a request unless it corresponds to the correct URL.
Essentially, this fixes the problem where images are sometimes not loaded.
Убраны стили. Работа над стилями отложена.
Testing data re-added
Merge branch 'master' of https://github.com/baroba/BrahmaProject
README is now with markup/markdown
Remove debug messages, use this as temp fix for Mongoid 3 with Heroku until better solution is found

Original Moped was giving "Can't convert Array into String" errors and changing mongoid.yml did not fix it for me at least
add tests for Array#sort
config.neon: fixed users service
Gem unicorn added
Post work
Merge branch 'master' of github.com:belucid/cookable-ios
added readme text file

description of the personhours docs
fix issue #1212. don't ignore url param when === 0

when a param value was 0 (or false) it was ignored and removed from url.
after this fix that only happens if the value is undefined or null.
Deleting + Saving now works (basic)
FBO work
- The server new sends full messages if the client is lagging too far
  behind
- Fixed indexing bug and improved client-side detection of very old
  packages
Make refresh interval configurable
changes to rake and capfiles
added hover of thumbs
Don't let Nerdtree hijack netrw

This way I can open a file with Ctrl-P immediately and open it 
in the current buffer/view instead of it opening a new split 
like Nerdtree.
Use find to speed up Ctrl-P file indexing
hide = del and set in diffs?
rename the right index

fixes bug 953159
This did not affect sqlite and mysql, because those can not rename indexes
and thus used a separate sql file to drop and create the right one.

Change-Id: Iab80a65464a591b732ecce4c00d04df50624e912
Updated RST docs on containers, fewer references to OVF format.

Updated the RST documentation that discusses container formats, since they
aren't really used right now.

Changed some examples from ovf to bare, since in most cases, users just upload
a bare image file.

Change-Id: I844d7827c3de4df6cdddb9b963cc2f236a3e6767
Merge "Publish v2 in versions responses"
Merge "Updated RST docs on containers, fewer references to OVF format."
Compile BigInteger to INTEGER for sqlite

Fixes bug 966243

Ensure BigInteger does not map to BIGINT for an auto-created
sqlite registry DB, as this type is not supported by sqlite.

Change-Id: I61f44fbe50ea406d2d593f8f53cab5da3af2222a
Merge "Compile BigInteger to INTEGER for sqlite"
Defaulted amazon disk & container formats

Fixes bug 972014

Default unset disk/container format to the corresponding container/disk
format, where the latter is an amazon format requiring a strict match.

Change-Id: I147df146940a21c368e95901343f36e1e3b7495b
Skip test depending on sqlite3 if unavailable

Fixes bug 973626

Add @depends_on_exe to declare a test dependency on the availability
of an executable.

Skip TestSqlite.test_big_int_mapping if sqlite3 not available on the
local PATH.

Change-Id: I1b7cf0636f79422f9f31f6a88a493791897a53b4
Reorganize pipelines for multiple api versions

* Partially implements bp api-2

Change-Id: Ie942c54e0ba294da661de870a95d685a9b8966de
Remove unused imports.

Change-Id: I9d602ed429caff8ffb00e40f623c473c5425e1cc
Fix db migration 12

* fix bug 976908

Change-Id: I0248f825396d08688238e6d2ef37c8fcb49e8c9d
Merge "Reorganize pipelines for multiple api versions"
Merge "Fix db migration 12"
Bootstrapping v2 Image API implementation

* Adding barebones of images, access, schema, and root resources
* Greatly simplify version negotiation middleware
* Partially implements bp api-2

Change-Id: I3ae72354d7ec7f3766aec164d305c52e7315200d
Minor grammar corrections.

Fix its/it's, clarify a few other wordings.

Change-Id: I4459e72e79caf84f4c69378cf20f7c443cf48b97
Merge "Skip test depending on sqlite3 if unavailable"
Merge "Minor grammar corrections."
Set install_requires in setup.py.

Inline shared version of setup.py from openstack-common. This can
be removed once projects switch over to use the shared version.

Updates setup.py so that it sets install_requires and dependency_links.

Fixes issues where pip installing glance doesn't properly install
dependencies.

Fixes LP Bug #975483.

Change-Id: I5a10b311cfde2fda4d4dac341dd866f868b72d0d
search for logger in PATH

fixes bug 978907

Change-Id: I16a20982cc90f3857e20ab23e2b3f5d1aa2722a0
Merge "search for logger in PATH"
added random mazeloader for now
Modernize the default template.
Fixing pyx
修改了引用文本的格式
Convert French comments/messages to English in logging infrastructure.
harvest service
Add .gitignore
Add module proto
Add module tcphub
Correction du CMakeLists.txt
Draft version of usblinker
Fix and ameliorations
Nouvelle version, nouveau nom (linker → daemon)

Marchote mais contient encore quelques bugs :-/
Ajout du contrôle du type
Ajout spécification du protocole
Ajout d’une fonction de controle du type
Pas mal de correction, on atteint la release :)
maybe install with --no-color is fine
Changing string manip for amqp privitives to bytestrings
Android localisation post + fix categories
Set indented-lists to true
updating _example_videoplayer
add Redis::fetchHashFields() method
fix referenced variable error
typo Google
Improve grammar
Even less tweeting
Open up the DHCPv6 server firewall ruiles
AS7-5536 Lifecycle methods in web.xml are ignored
spelling fix (milliseconds)
AS7-5577 Disable JGroups diagnostics service by default
AS7-5520 Warn "IllegalStateException: channel is not connected" on clean shutdown
Don't require session ownership lock if expiration is localOnly.
AS7-4140 Unify mcast params to just one -Dmcast
AS7-4140 Remove remnants of JGroups diagnostics
AS7-5549 Add support for @PersistenceContexts
localise templates on view load
localise templates on first initialize
Public -> Open channel in channelDetails.html
Merge pull request #122 from highfellow/master

Localise templates on first initialize only.
Report the source of timeouts
Added two helper functions for scanners

Signed-off-by: Brandyn A. White <bwhite@dappervision.com>
template placement bug
Added paging to threads
[Heroes.rtf] New donor!
[Heroes.rtf] New donor!
[Heroes.rtf] Reorder donor.
[Heroes.rtf] New donor!
[Heroes.rtf] New donor!
[Heroes.rtf] New donor!
Add ability to compile with the 10.7 SDK by pointing an env variable to the 10.7 Xcode.app.

This enables the Lion fullscreen feature available in recent code.

The binary built with the 10.7 SDK doesn't get lipo-ed in to the main emacs
(since there's already a 10.5 SDK based x86_64 binary). Instead, the main
Emacs executable is now a little script that chooses the correct binary
based on the current OS and execs the closes version that exists (without
going over).

This means you can't gdb Emacs.app/Contents/MacOS/Emacs directly any more,
but that seems like a small price to pay. I can't think of any other
downsides to this technique.
Document the XCODE_10_7 environment variable and Lion Xcode support.
Merge earlier Jenkins changes into master branch.

Conflicts:
	build-emacs-functions
bug
started to move TrackPiece
finished trackpiece move
renamed a file
bugs in trajectory
bug in trajectory pattern matcher introduced by java 7
Route construction checks are not honoring the error threshold for lengths.
makes sidebar collapsable
updates sidebar styles, make it work on pages without sidebars
adds stats table to project page
trying pjax again
added ease of creating tickets
Processors -> Processor
Defaults -> Options
Processor API
delete articles
pro_git upload
pro_git
Fixed closing span tags problem.
Updated `Collection.sort()` doc to clarify priority maintenance
pdf link for fallacy paper
Reed with uniform large noise
Reed with uniform large noise, logistic map
Reed with uniform large noise, logistic map
Merging test additions from 3225437 from @moom. All tests pass under 1.8.7 and 1.9.3.
- fixed unicode issue
Show the full output from the test program on failed tests so we can debug problems from the buildbot logs more easily.
Updated camera preview
use git-commit in vs
If creation of watchpoint failed on the device, make sure the list maintained by the target reflects that by cleaning it up.
Remove redundant calls to BAA->getArchName().  No functional change
intended.
Revert "Rework the retain-release.m test to use FileCheck and the "text" output"

Apparently the output of this test is not deterministic.  Needs investigation.
use base32 properly
minor changes i've made
smal changes
before i sleep
FINAL
Create ProfileView.xaml
Fix for yet another regression test issue on Darwin
Omit the data key in an event object if data is empty.
License on google_authenticator
Fixed encoding of config/locales/ja.yml to UTF-8
updated the length of twitter handle
Use getattr instead of internal pbs function.
reduced speed.
adding script to update pip packages
Got the nodejs, mvc, redis stuff all talking to each other
updated read me
base para styles
Commit a gitignore file
glorious clickbeetle updates

merged:

  gentoo: 92773550fef171dc07134052b80578d43eab1ff3
  cb-overlay: 412974ce862dfbde7fd72c381681bece61dfd757
  foo-overlay: 8298ae4a92dd6e9925442616a6fc83e73c965abf
  bar-overlay: 6c956f1ca6178fed85bda46013da787239706d7c
  flora: 66d990ebf04be11047f2a373f75900b9caf0a355
Some changes to the Galician translation to fit the interface better.
Merge pull request #598 from Gallaecio/l10n-gl

Some changes to the Galician translation to fit the interface better.
Fix Issue #578 gold loot not spawned properly
Fix avatar layers rendering
Merge pull request #866 from igorko/master

Fix avatar layers rendering
Add 'Show FPS' to video settings
Position fps meter relative to corners
Merge pull request #936 from dorkster/bugfixes

Add 'Show FPS' to video settings
Rough impl of get_subdirs
PION-1178: AC_CONFIG_HEADERS doesn't seem to like variables
Merge remote-tracking branch 'origin/4.0.x' into 4.0.x
Modify README.md
Modify hello.php
set default config file using environment variable.
compiled coffeelint
changing to 0.6 because of rsa
Add Canari PoC Release
Refactoring some zoneserver things into a character controller.
Also fix up some unit tests.
completely reworked autodetection, configuration scheme, added docs, lots of refactoring and clean-up
Moving objects together now works as expected (except when they are at different levels in the hierarchy)
httpd added
Make the Template interpreter works recursively
NB: variable names with space are not allowed anymore
Merge pull request #3 from codjo-sandbox/integration

Make the Template interpreter works recursively
Switch parent pom to the last codjo-pom stable version
[maven-release-plugin] prepare release codjo-variable-2.3
[maven-release-plugin] prepare for next development iteration
Switch parent pom to the codjo-pom snapshot version
Update README.md

test for conflict
THIS IS THE TIME ON SPROCKETS WHEN WE DANCE
Updated GUI to be more appropriate due to the lack of the random messages button now.
Actually fixing indentation issues.
[ENH] Python: Tab completion for custom attributes
[ENH] Complete python option and child access as discussen in issue #203
MB-100: fix indentation, line breaks and white spaces in testrunner

Change-Id: Ib0e92f25c623a8fb71a5c373667c75223551e76a
Reviewed-on: http://review.couchbase.org/22763
Reviewed-by: Pavel Paulau <pavel.paulau@gmail.com>
Tested-by: Pavel Paulau <pavel.paulau@gmail.com>
MB-100: add sleep to wait to server start

Change-Id: I9c691760efef477f4122baa2f1344353d94c0529
Reviewed-on: http://review.couchbase.org/20093
Reviewed-by: Andrei Baranouski <andrei.baranouski@gmail.com>
Tested-by: Iryna Mironava <irynamironava@yandex.ru>
add in index.heml
add in hello world HTML
add index3.html and index4.html
add index5
Merge branch 'hotfix/1.3.1'
Merge branch 'release/1.3.2'
Merge branch 'release/1.3.3'
boondongle
Merge branch 'hotfix/1.3.4' into develop
renamed images
Merge branch 'release/1.6.0'
add cremalab logo
add margin for new iframe youtube player
Merge branch 'master' of github.com:criticaljuncture/fr2
Change the format of requests.

Each request consists of a 4 byte magic number, a 4 byte checksum, a 4 byte
size, and the message. The checksum is the ieee crc32 checksum of the message.
The size is just the size of the message (including the message type). All
numbers are big endian.
gestion des listes de config
Merge branch 'master' of https://github.com/crobert/LogicielTrez
commiting inital project
removing php references in anticipation of going 100% javascript
Merge branch 'master' of https://github.com/crsrusl/jGalleryWall
refactoring of btree_stats.cc
Updated math classes.
Added handlers for various staging modules provided by kmod-staging package.
Added script to generate staging handlers.
Fix missing close of string in description for each handler.
Added @dcrewi to credits; fixed some more language stuff
Fixed another typo
revert last commit
Merge pull request #482 from dcrewi/master

fix issues with the api-util/xpcom documentation
Merge remote branch 'origin/master'
revert last commit
Merge remote branch 'main/master'
added event tutorial
fixed some typos
Throw an explicit error message to ease repack of addon using SDK <=1.5 and xpcom module.
Fix bug 711814 - console.log should prefix logged messages with addon's id
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'main/master'
implementing per-window private browsing observer
adding some documentation
supporting the 'private-browsing' event on FF 14
comment change
removing a setTimeout
adding tests for browserWindows.on('private-browsing')
Revert "Merge pull request #475 from ochameau/bug/764831-avoid-leaking-js-proxies"

This reverts commit 983a9efe8ea2decc1f1e594799f4c0eaea5b1efb, reversing
changes made to 4985566467c1aee779f4a3e2f3b3fb426cede77b.
Add hacky version specifier.
Added a null check to the item position in scanToSelected. If null, it creates a new position with 0,0.
bumped blacklight gem dependency to >3.2
1.1.21 changelog
Suggestion: Fix for fixed persistent toolbar padding
Wrong check condition for pageshow should not be a part of this.
Adding a condition for the given page at updatePagePadding() as suggested.
fixes flickering transitions withing a phonegap container
Border width subtracted from page min-height

This patch takes in account for custom borders on the page when setting
the min-height.
Fixed #2234 - form hijacking wasn't respecting allowCrossDomainPages, now it does!
centralize cross domain request check
navigation add tests for cross domain check helper
changed disabled type to boolean
changed disabled type to boolean
delint, move function instantiation outside the for loop
delinting
delinting vmouse, small variable reorg could be an issue
delinting vanilla select and textinput
Fixes #4418 - Include padding for the fixed toolbars in the 100% height of ui-mobile-viewport-transitioning.
whitespace and declaration order linting
whitespace and equality linting
complex if statement formatting
focus on linting the mobile files first
[popup] Prevent jump to 0 between popups
sets edge attribute and color in completeReactionEdges()
borrar metodo search
Send DMX OSC messages based on activity
add test for bulletml.enchant.js
add example bulletml
update bulletml.enchant.js
added a remote php example of how to plot thermd info in a webpage
Fleshed out example a bit more in the README.
add a screen baby. add it.
Modified ASTHelper,Method: added retrieveMethodAST method to ASTHelper, now used to initialise Method.
Modified AST: modified AST to capture initial indent whitespace as part of method AST.
Initial OOP Classes
ips autocomplete editable for patient
ips autocomplete editable for biopsy, diagnositc, hospitalization, medical, procedure
Remove two apparently useless variables.
Revert that last commit, we do use it. Stupid IDE...
Refactor Vocabulary::move_term().

Add documentation about the process it goes through, stop assigning negative left / right values to the objects we're moving, and save at least two queries for every move operation.
Revert 35735ae90dde15.

The changes I made to Vocabulary::move_term() in 55ff9904cadec mean it's no longer necessary to have signed integers for mptt_left and mptt_right.

Related to habari/habari#229.
Changes to get child things working more.
Still in progress.
Improve textmulti behaviour so it is attractive again and works consistently on plugin config pages and within block config modal windows. Fixed habari/habari#199 too.
Fix sortablity of blocks after changing scope.  Fixes habari/habari#234
Allow areas resorting to be saved everytime there is a change and not just the first time.
automatic POT template generation
merge from subversion client
Theme's $this->get_url() now accounts for the calling class/theme.
If you call $this->get_url() from a parent theme, it returns the parent theme's url.
If you call $this->get_url() from a child theme, it returns the child theme's url.
It's magic.
Pull through parent add_template_vars() in Charcoal theme. Clears $locale and $charset related errors.
automatic POT template generation
merge from subversion client
Allow plugins that have no closing php tag not to blow up the admin.
Allow $trail to be trailing path, not just boolean.
Add a unique token to the Habari Silo upload form to ensure the validity of the upload
automatic POT template generation
merge from subversion client
automatic POT template generation
keys.json
fixing missing query string from each menu item
making sure posts widget it on the correct HEAD state
merge completion
Rollback first version.
Merge pull request #48 from datadryad/atmire-1289

Rollback first version.
Forgot logic file.
ironing out some disfluencies in the readme file
fixing angleColor bug, see description for test. Also simplified handling of stroke and fill color

fill angleColor,155
move -0.5,0,0
scale 0.3
3 times ->
	move 0,0,0.5
	1 times ->
		rotate time/10000
		move 2,0,0
		box
se incluyo el copyleft al archivo crearDB
para seguir los standares de las licencias gpl v3
first
Merge branch 'master' of https://github.com/davidtsuji/sg-notify

Conflicts:
	index.html
fixed some more sweeper issues.
gemfile
velocity getter
fixed conflict
Fix RequestManager unittests

- Add default performance parameters
- Make sure WMStats is deployed in couch during the tests
adds functionality for user to retrieve the error message after closing out
CourseIndexer stuff
CourseIndexer merging
Fixes README typos.
Merge remote-tracking branch 'upstream/master'
Update src/com/modcrafting/mobspeed/Mobspeed.java

Removed Damage field.
Temporary (hopefully) fix: replaced pound symbol with '^' because something on my netbook hates british people.
Fixed the caching of ComponentLoader and fixed one of three bugs affecting object Type display
Unfinished: made an error stream per console and redirected them all through a common error interface
Finished error console redirection, introduced a strange bug with ConsoleInterface::Error.

Type an invalid command into the Editor console to replicate the bug
Unfinished: Made UserInput and Controllable interfaces.

These two classes work together to map controls to events.
UserInputInterface fires UserInputEvents to its subscribed ControllableInterfaces.
ControllableInterfaces then fires a virtual function with the name this event is mapped to, which can be listened to by other objects in the vicinity.
Also made ControllableComponent, implementing ControllableInterface, which (unimplemented) will handle the events based on complex instruction.
Need to make a component implementing UserInputInterface that reads from the CEGUI adaptor, and uses a PropertyBagInterface as the controls.
Unfinished: CeguiPanel is a Component for attaching a render and input context to a CEGUI::GroupBox

It needs to be given a Controls class, similar to PropertyBagInterface.
I also need to think about how RenderTargetInterface will be used
CeguiPanel now compiles and runs, but isn't functional
Made a crude control scheme and workspace switching

Need to tie the workspace switching into changing control schemes, make a render target class under game, and then I will be able to have multiple games running in different windows
Made the enter key work in the console
bug fix in checkUnique
less elipsis
duplicate pages in contributions, recent activities had wrong order
Merge pull request #127 from hc5/profile

Fix contributions/activities listings on profile page
Testing committing files with the windows gui
Merge pull request #1 from ARdeWeerd/master

testje edwin
FIX + ENH: intermediate commit

- adding more systematic and better documented tests employing a parameter-scan protocol
- fixing ica details.

the tests revealed corner-cases which still aren't fully covered.
ENH + FIX: Added extensive systematic testing for different parameter ranges and combinations.
- Fixed a series of bugs emerging in certain corner cases..
- Added more catching to avoid certain corner cases instead of adding magic. E.g. now in one ICA session only one decompositions is possible. For decomposing epochs afer raw was decomposed the user now must start a clean ica session. Otherwise we would have to deal with a hidden 're-init' function that re-initializes the ICA session and overrides the n_components / etc. paramters -- if it would't mysterious crashes inside the dot products will appear. However, I don't like to add this kind of  bug-prone magic an prefer a clear cut: Just new ICA session.

I think this is reviewable now. @agramfort : is the history still accaptable. Shall I rebase / cherry-pick, etc.?

D
nya.Avia.Search.Model dummy created
some static names moved to the nya.C.AVIA constants namespace
Variants module added
Search form model started
added beginning of api documentation containing user object definition
Ask for confirmation before actions
Support for Theme based View Override.
Add omega_bare theme
better position but all is pretty beta
Update default path documentation

Now it includes :class and :id_partition
Changed the title to "Space Frigates"
Removed the StarCollection because it was not being used.
Updated particle to proper "class"
Change missile to "proper" class
Changed the ships velocity so that it doesn't rotate so fast.
Switch the commands from being Backbone objects to classic "class"