labofsahil/github-event-dataset-2012 huggingface dataset:
Initial implementation of 4sq authentication
Changed Yahoo to Google
Merge branch 'master' of https://100kV@github.com/100kV/GroupOne.git

Conflicts:
	src/TestServlet.java
Vendor Add Coupon function working
添加了产品显示
Initial import of files
Updated configure, Makefile
Version update to 1.8
Only fetch timeout from config once
spring break - step2
status quo
adapted postprocessing for ASK queries
verbalised all OPTIONALS as modals
Forgot to update the version :P
This shouldnt be coreexported
Fixed DBAL-139 Oracle's sequences with NOCACHE
Revert "Fixed DBAL-139 Oracle's sequences with NOCACHE"

This reverts commit 3c7bd5b15d2dfb1f6ffe805a8141ff0601cf441d.
Merge branch 'master' of ssh://github.com/AduroIdea/dbal
pagina 404 customizada
Small bug was fixed in the synchronizer.
Fixed minor bug where empty SongData structs throw an error in GetHashCode preventing initalization in some cases.
Updated localizations. Removed unused usings. Moved PlayTo code to its only class. Added a network manager that handles if theres a network connection and if the device is approaching it's data limit.
aws cpi should recreate vm when security group changes

- updated bosh_common gem to 0.5.0

Change-Id: I8aeaf482e2ba868fd4281092cfacaa7fc4a219be
Merge "aws cpi should recreate vm when security group changes"
warden: Include net.sh in start/stop

Change-Id: I82043874ee57e270227ba774bb42491145d2252c
warden: Import relevant upstart definitions

Change-Id: I0bc63c56c17de8d041473d49a0dbd62cf11efc95
warden: Modify upstart definitions

This changes makes upstart run the jobs we need in a more predictable
order. Because we use console.log to probe whether SSH has already
started or not, we need to postpone starting rsyslog or it would capture
everything written to /dev/console to /var/log/syslog inside the
container. In addition, we want SSH to start when the virtual ethernet
interface has been configured (or it still wouldn't be reachable).

Change-Id: I20ec13e30eefa5e896797f5be17680ccacdbc0a4
warden: Wait for "running" event on container start

Change-Id: I695e88aaaf96e906f6a1a53f85a820d93f2b4010
warden: Include network in example config

Change-Id: I116b6e90d44d93292d4281ee9cf9744289f4e864
warden: Prevent concurrent execution of net.sh

In some concurrent benchmarks `iptables` exited with a non-zero status
and the message `Resource not available` (which I assume can be traced
back to an EAGAIN in netlink I/O). Prevent this class of errors from
happening by not executing `iptables` concurrently.

Change-Id: I20b9cdd4397d79f16a1968b267b91a54b14cc6d3
warden: Rewrite README

Change-Id: I3f46d12be635553e180c587a375ec17ffdadb944
warden: Log when ready

Change-Id: If462897edeadc8b55a8a58b4ee39031b98880414
warden: Add short "Getting Started" guide to README

Change-Id: Iec406cfaae88e5a016453a1c2cc9024840168967
warden: Remove docs on run-time disk limiting

Change-Id: I74485030d5ebbf6baa4e29c6d32ec98249dae9cb
warden: Capitalization

Change-Id: I9bf099c1116326fcc8235c85ca01372105854b1e
temporarily remove acm/acmdb from dev_setup

Change-Id: Ifc49132e0eb9a59257c359ba8eb3b6b332d8c674
warden: Consistently wrap variables, quote strings

Change-Id: I100fcbb4f3d79e307e97c91637538b214e1fbf49
[hm] Introduce an option to give up on flapping app restarts after
configured number restarts fail.

This augments exponentially delayed restarting of flapping instances.

Also, adjust default values for parameters responsible for flapping behavior.

Change-Id: Ie927040f276009e722c364fb50c1280acee6d47c
warden: Allow clients to specify the container's disk size

Change-Id: I1542fba9206de25c512e32f96367f32394638324
warden: Oxford comma

Change-Id: I1220f8bfb4f05c456f042cb1755a23ce3656667a
warden: Document "grace_time" option

Change-Id: Ic355c0fb628ec7f6bfaf767f6a9b5ad167a9982e
warden: Typo in README

Change-Id: Ia14683cc631873bd88409b771c236b907c20fb59
bump uaa submodule ptr

Change-Id: Ia6fbc3fdf1583140b205598d901c776ac48c472e
extend nginx timeout in dev_setup

Change-Id: Ic00e1a682cf66fcedc7fdeba0f0172f447d3179c
tweaks & factorizing with boilerplate.tex
physX project conf
unit test for proovage
embed the indirection value in the address itself, fix some bugs add examople, cleanup
polymorfisme toegevoegd.
Meerkeuze, opsomming, reproductie, valideerbaar
+ github button on spc.html
basic view/delete/edit
added cix100 division and content
Menu des options moche mais fonctionnel :)
agregando mas ignores
Added data validation to the Item class. Updated tests to match.
Changed controller to use new refactored validation.
Merge pull request #97 from CS340Group/murphy

Murphy
Changed BaseModel to be named ModelFacade.
Missed some.
Merge pull request #73 from CS340Group/murphy

Changed BaseModel to be named ModelFacade.
added advanced exception handling to http request processing
dropdown menu in header, breadcrumbs start with home instead of site name, better table design for loops, subforums now have their own row on forum loop
modified bubble animation to remove scaling
#76 Fixed BuildPages method
Added pagination support and fixed one test for users with non-English locale
Test for Razor engine pagination
Parse header tags and categories, populate site context
Sort tags and categories
cleanup and addressing some tests which are not being executed
build number incremented
let Host handle IPs too.
Handle deteching IPs better in Whois.
Add some more test cases for the previous two commits.
Merge branch 'master' of github.com:CodeBlock/dagd
Initial Commit
Merge branch 'master' of github.com:CoteRL/Gallery
modification de l'affichage pour le cas ou aucun groupe de cours et/ou aucun groupe d'etudiants n'est lies a la promotion selectionnee
detect existing grouping based on name if we can't find one by id
don't create blank groups
add a sync button
添加一张原始图
WGO pond decorator & populating code (and a fall through fix)

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
works NN Learning with octave
Beefing up tags tests.
Removing silly example.
Removed unused functions (Datadog.metric & Datadog.event)
Don't actually need the datadogAppKey for posting metrics
Can pass in 'hostname' as a config parameter.
Fixed issue where loading the graphite data was removing the counter before datadog got access to it.
Fixed issue where an http error would cause nodejs to crash.

When this happens, it will currently lose the data that would be sent.
Merge pull request #1 from BestFriendChris/testing

Various dd-statsd fixes #lgtm
Delete picture, add some features, modify builder to take the moover. ALl fonctionnal
Add API for managing mob spawn limits per-world. Fixes BUKKIT-1565
Updated version to 1.2.5-R1.2 in pom.xml for Beta.
Updated version to 1.2.5-R1.3-SNAPSHOT for development towards next release.
We default to OP
Made clearPermissions public. Addresses BUKKIT-1541
Merged
Create detailed statistics, modify detailed_stats/index.html
Create detailed statistics, modify detailed_stats/index.html
Create detailed statistics, modify detailed_stats/index.html
smallering code
Optimized object delivery to next view by segue.

- Using prepare for segue method it is possible to work out which cell
was selected, so it is not neccessary to save selected account or
category in table view delegate method.
Update e_mod_has_opengl, now checks for opengl extensions
入库单查询
Signed-off-by: Endis <369029432@qq.com>
glcd branch
merge
Git ignore updated
Ajout de la bibliothèque GLCD pour PicOS18, et d'une tâche d'affichage.
Commit du workspace.
Integration driver GLCD dans picOS
Merge?
Deleted TP4 Gant
Merge branch 'master' of http://github.com/Ephasme/sysemb

Conflicts:
	.gitignore
	Project/MyApp/define.h
	Project/MyApp/int.c
	Project/MyApp/main.c
	Project/MyApp/tsk_task0.c
	sysemb.mcw
co-train file mode
Fix version >= check in FLP
Added feature to extract version number
fixes in extract_data
fix to raise exception with logging
Fixed Error message in extract_data
Merge pull request #104 from RanjitK/master

Extract data fixes
Merge branch 'fix/extract_data_exception_handling' into development
Code~
Fix: Crash avec le switch des categories dans FTV.
Switch to relative import of settings in modules in naoko.lib.
make main function in main (though naoko.main.main() is kind of silly.
make a launcher external to the naoko package
Add setup.py and support building executables
Přidán úvodní text
fixes so dox don't break in readUntilDox function, also messing with the comments
change links + insert data
fix path for receive_token.html
Klar med kmom04 modeller for login, anvandare och grupper
fixed default.xml

Change-Id: I1abbe56efd4d5e338338549d608af78ae0d49b32
pending changes related to beautifier removal
not showing details when no torrent selected
Changed to a more modularized approach to the panel, toolbar, details
Started on a settings view
Substituted with a chemistry graph as web lab from OpenClipArt
project buildable again
testing stripes for the tree

How to exit the nested transform, draw the stripe and then return?
stripes and birch texture added

bugs:
- stripes are facing wrong directions
- the last cloud gets outlined in black
fixed the last cloud outline bug by quick hack

An additional cloud gets painted outside of the viewport to
avoid the visible effect.
Fix title for video page
Merge branch 'case-672' of github.com:IliaDragan/vg3 into case-672
Project page, project styling
Merge branch 'case-672' of github.com:IliaDragan/vg3 into case-672
island tunnel o0 o0 n1: Den Höhlen eingang im oberen linken Bereich durch einen durchsichtigen ersetzt.
Das sollte Issue 166 entgültig behebn
Modifying kappa factors
Adding the ability to fix parameters
ok holds work for real now i swear
Use Thin
UTF8 fixes, suppress an error on kick/part
org publish update
Merge pull request #356 from Karang/master

The "spawnmob npc [name]" command now spawn a human entity in client.

Eventhough this should be done server side through AddEntityMessage, pulling this anyhow as its good for testing.
Start implementing client handlers.
Signed-off-by: Karang <arthur.hennequin@free.fr>
Disallow the old control URL.
The peer to peer status is now refreshed when looking at that panel.
Create a local database for each of the hosts.
Instruct Obor to save the captured peer data into the peer databases.
Send the appropriate accept header with the request.
Using the fostlib namespace to shorten the code.
Merge branch 'feature/mlz-1' into develop
Effets magiques multi-tour + interface
JSON.JSAN.addTo(Collection) method has been promoted, which can accept any type that extends from Collection, and return the corresponding type of the result. But instead, if the parameter is null then this method would do nothing.

Signed-off-by: 核心力量 <kernelforce@gmail.com>
Log how the elastic mapreduces go, to ka-mapreduce/log.

Summary: We were already doing this in emr.py, now we do it here too.

Test Plan: crossed fingers

Reviewers: jace

Reviewed By: jace

Differential Revision: http://phabricator.khanacademy.org/D941
First pass at hive mapreduce jobs to get data for learning efficiency dashboard

Summary:
Please see comments in code for more information. Basically, we want a dashboard
to measure how much gain in learning each card is bringing, across different
user groups ("segments") such as what experiment a user is a member of, whether
they have a coach or not, etc.

The data processing is not finished yet, this is just a start, but I want to
send out a review to make sure I'm going in the right direction, to get some
initial feedback, to let people know what I'm doing, and because people don't
like big reviews (sorry, I could probably have made this smaller but I'm really
just learning all this so it would have been a little too volatile at the
beginning).

Some upcoming TODOs in future reviews:

- cron job to run topic_attempts_summary.q daily
- get accuracy_deltas for time done (in addition to card # as we have now)
- get final result into mongo
- get more information on user segments

Trello card: https://trello.com/card/4f9f3469a81e7053712b88ad/72

Test Plan:
Ran some sanity checks (eg. correctness of cards from a random
distribution Pr(card = correct) = 80% (verified output was also random),
just reducing to get avg. accuracy at each card #).

TODO(david): Write unit tests for custom Python mapper/reducer scripts?

Reviewers: jace, yunfangjuan, benkomalo

Reviewed By: jace

CC: tom

Differential Revision: http://phabricator.khanacademy.org/D200
convert daily ex stats to sleepy mongoose

Summary:
the upgraded highcharts requires sorted data.  i chose to
convert to sleepy mongoose rather than sort client-side.

Test Plan: ran locally

Reviewers: benkomalo

Reviewed By: benkomalo

CC: yunfangjuan

Differential Revision: http://phabricator.khanacademy.org/D383
Added rendering script

- tilerenderer.py, not using 2.7 Pool yet,
- fixed a log of thing to make meta tile render work
Version set to "git"
Fix the color of the discs in the contents
Drew teh artz
gem thin (webserver)
Fixed HTML highlighting bugs
asdfasd

adsfasdf
Register the library before calling load to break library loops.
Provide some symbol info to GDB via the JIT interface.

Conflicts:
	.gitignore
	src/dyld/ld.cpp
Cambio para el conteo de todas las jornadas grados para las sedes
Cambio para el conteo de todas las jornadas grados para las sedes
add simple SCL test app
Mudancas no style.css e busca.css
Se corrigieron algunos problemas de conversion binary2int
Se inicializó la estructura del TP1
Arregle el RBF. Hice una tabla comparativa de RBF, SOM y MLP
Change for Debug
Added a separate hoop to index HoopKVDocument instances into a Lucene
index
Refined the example Lucene search, which is nice to have as a reference.
Also added a Wikipedia access Hoop that uses all the nice classes we
already provide for http and xml access
The experimental hoop seems to be working it processes documents per
thread that were selected based on certain criteria, we then look for
specific information based on a pronoun model and save the output to a
spreadsheet
Major upgrade to all the text and token based hoops. We can now generate
a pretty decent basic lexicon. Right now some nice features are being
added but the basic mechanism is working nicely
Changed the basic text file reader to load and process a list of files
The generation of unique terms and lexicon through hoops is now working.
It needs to be tested with a fully directory of files because currently
the hoop that generates unique terms doesn't keep its contents
Add 'Two Up View' option

Use param twoup=true
P1 Aufgabe 2
Merge branch 'master' of github.com:Monddrache/AP2
Updated to convert snake case page urls to capitalized page titles.  This is to be used with the GET action for non-existing pages.  Also added tests for potential page titles.
Added required php files
Nicer rspec defaults.
ASGARD-976 - upgrade AWS sdk
To at least 1.3.13 so that I can set the scheme on an ELB, but we might as well get the newest one.
ASGARD-976 - set ELB scheme on ELB creation
It is related to our subnet purpose.
Merge pull request #114 from claymccoy/ASGARD-976

Asgard 976 - set ELB scheme on ELB creation
ASGARD-906 - Fix Halloween icon references

The process of fixing a file with incorrect capitalization is cumbersome in Git, so for now we'll accept the inconsistent capitalization of the file names, so that the GUI will look correct.
Merge pull request #115 from joesondow/ASGARD-906-Fix-halloween-icon-references

ASGARD-906 - Fix Halloween icon references
Remove unused imports
ASGARD-969 - Change visible "Discovery" output to "Eureka"
ASGARD-969 - Migrate discovery config to eureka
ASGARD-969 - Make Discovery port and URL context configurable
ASGARD-960 - ASG termination policies
ASGARD-980 - Report fast property changes from "asgard", not from "nac"
ASGARD-929 - Task subject emails should not contain hardcoded 'nac' String

Also, a bit of rewording for the subject line to move short, pertinent info up front.
ASGARD-981 - Subnet purpose selection was ignored when creating next ASG
Also fixed the order of purposes on Cluster show and a bug when not selecting any security groups.
Merge pull request #120 from claymccoy/bug_ignoring_vpc_selection_for_next_group

ASGARD-981 - Subnet purpose selection was ignored when creating next ASG
Merge pull request #118 from joesondow/ASGARD-980-fast-property-sourceOfUpdate

ASGARD-980 - Report fast property changes from "asgard", not from "nac"
Merge pull request #119 from joesondow/ASGARD-929-Task-subject-emails-without-nac

ASGARD-929 - Task subject emails should not have hardcoded 'nac' String
Merge pull request #116 from joesondow/ASGARD-969-config-discovery-port-and-URL

ASGARD-969 Configurable Eureka port and URL context
Merge branch 'master' into ASGARD-960-termination-strategies

* master:
  ASGARD-981 - Subnet purpose selection was ignored when creating next ASG Also fixed the order of purposes on Cluster show and a bug when not selecting any security groups.
  ASGARD-929 - Task subject emails should not contain hardcoded 'nac' String
  ASGARD-980 - Report fast property changes from "asgard", not from "nac"
  ASGARD-969 - Make Discovery port and URL context configurable
  ASGARD-969 - Migrate discovery config to eureka
  ASGARD-969 - Change visible "Discovery" output to "Eureka"
  Remove unused imports

Conflicts:
	grails-app/controllers/com/netflix/asgard/ClusterController.groovy
Merge pull request #117 from joesondow/ASGARD-960-termination-strategies

ASGARD-960 - ASG termination policies
Remove remaining NAC references
Updated the codebase to remove several abstractions that appeared to be illogical
Deleted/moved various files
Fixed the prototype
- Removed AbstractGUIController
Added Plugin Information
Build Ubuntu 12.04 packages
ud - API
Update lib/seer/bar_chart.rb
Moving op_mv_halo_device() and op_mv_halo_list_device() to op_mpi_cuda_rt_support.c
Try some form posting, for addCrime
feature #1223: Removed no-longer supported DISK/SOURCE attribute from VM_RESTRICTED_ATTR in oned.conf
feature #1013: Updated the oned.conf file with hook information
Fix onevm help typos
Primera aproximación a figuras rellenas.
Colores mejorados.
Separeted macroView from control
Merge branch 'master' of github.com:PSE-2012/MMWTV
extenden gui chapter...
Alpha version
Mise en production !
Minor fixes
Design enhancement
refinement of README
Fixed bug with regex mapping
add a whatsnew-1.4 document
Merge branch 'master' of github.com:Pylons/pyramid
[802] Other/Checksum: 4608377f5d75d878416f1d13eced5b00

Signed-off-by: Chiruclan <pascalvahlberg@yahoo.de>
finishing touching, and a beginning of 'fsplit' support in QTVODosx (including in the settings dialog)
Added root folder to ROOT so we can easily refer to it in the settings file instead of hard coding the entire path. 
Merge pull request #4 from Danieln10/master

Added ROOT to settings file
Remove unused locale strings
Keep station list ascending sorted.
acid -> D
Merge branch 'master' of github.com:Reamer/AcidDev
Merge branch 'master' of github.com:Rikhart/solrac

Conflicts:
	application/logs/2012/09/28.php
jqueryui actualizado a 1.8
Merge branch 'master' of github.com:SIGMA-IT/login

* 'master' of github.com:SIGMA-IT/login:
  probando mrios
  cambios
Actualizacion Common
modif tablet bug css all
modif tablet bug css all
add box url, thx @siuying
séparation des header
Bus company Business Model Added
debut partie 3
Added TMP Dir deletion option
Hard linked syntax highlighting crap.
Add a handy accessor 'isDirty' to check if a model is in the dirty state.
Added tests for isDirty
Factor isDirty logic into its own function.
added shim for getPrototypeOf
removed Array.slice which doesn't work in IE8 and seemingly unnecessary
Revert "added shim for getPrototypeOf"

This reverts commit 4f19b12aa67b7e4258a9a9c671f32197319b89ac.
Merge pull request #418 from Shopify/ie8-fixes

removed Array.slice on nodelist that was conflicting with IE8.
AjoutUtilisateur : opérationnel
Version 1.91 Bug fixed
Make dropbox/proxy readable
Migrate streamer to express3
Migrate dawg to express3
Migrate worker to express3
Migrate apihost to express3
Migrate tests to express3
Migrate resources to express3
Update express in package.json
Improve logging

- Use process.hrtime
- Log the HTTP verb, our response code, and the time
Fix partials for resources/
Add tests for webservice
Clean up webservice
Convert servezas.load to full sync
Allow suppresion of logs for tests
Update mocha to 1.7.x
Update dal-fake to use lconfig.debug
Working test suite for webservice!
actually catch the right error message that comes from tostring safely
add full support for facebook checkins and checkins_feed, fixes Singly/API#75
Merge branch 'master' of github.com:Singly/hallway
Clean up syncManager in preparation for new queue
Job queue (WIP)
Clean up/comment hallwayd.js
Improve error mesages in ijod
Job queue (WIP)
Remove bizarre merge cruft from package.json
Add some notes about error handling
Fix errors introduced while rebasing to master
Remove some debug logging
Planet21
More advanced makefile
Fix version bug in reinstaller
Add version testing in reinstall test
corrected the scale.  This param should be renamed
Add cuboid set functions
Implement block change event
Implement cuboid change event
note
Shell scripts for starting spout server and client
Очистка формы снятия скриншотов от мусора
Added quotesTJS
Add language support

It is configured through LeSablier/LeSablierConfig.h
If no language is specified, the support is removed to save some memory
minimized the css nd js
Fix accept check so materials for war won't get accepted if it's off in the settings
Don't need the int members
Added SpeedTank Keep at Range toggle, will KeepRange instead of Orbit speedtank targets.  Does NOT have collision avoidance!
Hide DropoffSubType
Adding a frame
Add children
Move elements down in prep for designing dropoff frame
Start dropoff frame design
Checkbox != Combobox
Unfortunately Combobox isn't going to work

Doesn't do well with dynamic UI - I could make it work but it'd be very
cludgy
Resizing elements
More resizing
Remove frame name
Need a frame name

Also need to update all UIElements
More resizing and jumbling
Restructuring UI display based on Dropoff Type
Tweaking OnLoads
Don't automatically show DropoffList
Move Dropoff Container and add Personal Hangar to Dropoff Type actions
Missing Breaks for Personal Hangar switch
No longer need a default action in Dropoff switch
Don't show DropoffList
Move container name down
Add information text for add and remove buttons
Removed the web directory
removed statics to resolve linker issues
Implemented more callbacks, most with dummy code, to be updated yet.
Improved ScopeTest
GhostTest
updated comments about the SCxml constructor's source argument
third argument to SCxml constructor to initialize datamodel
remove incorrect comment info
Route & Router Tests
Worked on Koans solutions
Added Floor Plan Images
Updated css.html with typography section
Fix bug ZK-1462
http://tracker.zkoss.org/browse/ZK-1462
fix zk-1469 argument type mismatch when try to get @ScopeParam with @ref value
Merge commit 'master' into zk-1469
Fix bug ZK-1218
http://tracker.zkoss.org/browse/ZK-1218
fix ZK-1468 Value doesn't be reload if it binds to @ref and in include
Merge commit 'master' into zk-1468
Conflicts: zkdoc/release-note
Fix bug: ZK-1309
http://tracker.zkoss.org/browse/ZK-1309
Adapts backend with the new design updates
Uses data contact email in alerts mailer
Add support and project for Visual Studio 2010.
Abstract reactor server
Fixes

Character can't shoot self, shield sound only plays once, bullets make
noise
Merge pull request #1 from WiktorS/81ca8999e78049e53fcef57ca7fcd4a1e0f76583

Work in progress 2012-08-03
Now it works ;)
Refactoring
Merge remote-tracking branch 'upstream/master'
Created new controller to keep json interface separate
Fixed TAB issue.

Signed-off-by: Wolftein <agustin.l.alvarez@hotmail.com>
Update samples/bbui-0.9.4.js

Added "fly out" effect for peeking menu using the following code:

// Only care about "fly out" effect if peeking
if (!menu.peeking) return;
this.style['width'] = '614px';
this.style['-webkit-transition'] = 'left 0.3s ease-in-out';
this.style['left'] = '-444px';

// Only care about "fly out" effect if peeking
if (!menu.peeking) return;
this.style['-webkit-transition'] = 'left 0.3s ease-in-out';
this.style['left'] = '0';
Allow navigation 1 character after EOL.
Push current branch to upstream branch automatically when pushing
fixed problem that SSH port setting for Sftp password authority was not valid.
change module_icon.png
fix `hasupdate` problem

detailed_version のバージョン番号が手元のものより取得するもののほうが古い場合にもアップデート通知されてしまう問題の修正。
Version 0.27
new file:   Java7/WatchFileEvent.java
cleaned up run-time messages
suche korrigiert
Tilføjet ny ebnf eksempel
Parser / Lexer done
Lavet det om til prioiterings liste
Merge remote-tracking branch 'origin/master'
Translate a little by ZyPax5! I continue more later
Change artwork, enable betanag, fix productName
Fixed menu regression
Merged path removing duplicated option
Fixing FS fragment
Fixed search not working
Update to allow the install of tomcat 7.
Pull in phillip's tomcat7 support.

But not his redis session support.
ServerLifeCycleListener does not exist in tomcat 7
Start tomcat at the _end_ of the recipe, so we can overwrite its configuration first
Merge branch 'fix-tomcat-7-server-xml' of git://github.com/DrillingInfo/tomcat into DrillingInfo
Upgraded default attribute to version 7 of tomcat, migrated users recipe into default as I always am going to create an initial user, made sure the tomcat user has bash as a shell and that the account is locked. (This allowed tomcat to run as a daemon under the tomcat account.)
modifications demandées par Cristina par Marie
remove unused imports

import fabric - never directly used
import fabric.context_managers - only used for settings which is imported to fabric.api
Add git grep config to .gitconfig
Now that we see what happens when test fails, fix it!
Define empty brackets.app namespace
Update samples/de/Erste Schritte/index.html

Prevent of getting lost in the translation of "humble beginning."
Merge pull request #1608 from mynetx/master

humble beginning
Check keys on keyPress events and invoke code hints on keyUp events.
Set shouldShowHintsOnKeyUp to false as added precaution as we pass key events to hintList.
Merge pull request #1351 from adobe/rlim/code-hint-issue-1350

looks good
changes from td
Merge remote-tracking branch 'origin/master'

Conflicts:
	Squick/Squick/src/Component/Collectible/Bomb.cs
	Squick/Squick/src/Scene/Levels/Level1Spawn.cs
	Squick/Squick/src/UI/Score.cs
	Squick/SquickContent/SquickContent.contentproj
some design improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	Squick/SquickContent/SquickContent.contentproj
Merge remote-tracking branch 'origin/master'
misc
asdjf"
"
Merge branch 'master' of https://github.com/agale123/Catan
trading works sort of
Merge branch 'master' of https://github.com/agale123/Catan
SN algunos arreglos
ortest: fixed the git HEAD commit message parser.
working on rendering multiple backgrounds, and fixing the camera to work with it properly
camera will not move if player is on last background for that level
working on rendering 2nd image
Add trade code generator method.
Started adding speculative trading calculator. Work in progress.
added conversation scope and bound to ExtendedEntityManagerStrategy; added tests for conversation scope + extended entity manager
Fix readme formatting nit
Sandbox Demo
Sandbox Demo
renaming
update readme
Add author link and optimize images
[MF] Extended tests for commutative ops.
Added null-as-object check and better decision on what gets sent to the server
Merge branch 'feature/clinpm' of github.com:ajaxorg/cloud9 into feature/clinpm
Change Makefile.dryice.js call
Fix packed version
Make some destructors non-virtual
Web.Component new methods and tests. Refactor DotNetObject type processing. New debug in Machine
ArrayedCollection in Library.st, add:, size methods with first test
Added tar that was ignored last time
added the beginnings of the SVM classifier
v0.2!
Domain object and basic functionality were added
Merge branch 'master' of github.com:akhad/examples
jackson test was initialized
Modify friendJson
Recommendのテーブルを実装
Impliment the worst integrity check EVERY

Oh and an icon.
add css style to not display sort arrows on certain columns
datepicker handling and paging fixes
Implement ids[] GET request for Surveys
don't stop believing
#43: implementing PresenterSettings - class that control actual gui window where user can change settings
Remove all .pyc.
Bump ActiveMerchant to version 1.27.0

[Fixes #1861]
Convert admin/zone.js to coffeescript
When calling checkout_flow, call define_state_machine! also

This means that calling define_state_machine! after calling checkout_flow is no longer necessary
Convert admin/shipping_method.js to coffeescript
Refactor JS
Fixed a problem with the image_settings_controller_spec setting the storage type for Image which breaks the product_spec [Fixes #1864]

Fixes #1865
Check for empty keywords moved to implementation of get_products_conditions_for

Fixes #1846
Updating a prototype should allow to empty its properties.

Fixes #1859
Cut whitespaces
Refactor Spree::Product#master_images

By delegating #images to master variant, we could avoid the expensive
JOIN of :has_many association
Minor tweak for README
Fix cart.js. Thanks @markj9 for pointing it out
Set content_type during an API request

Fixes #1866
Don't depend on spree/core/version for dependency inside spree_cmd/installer
Relax dependency on the jquery-rails gem to allow for latest versions
Cut trailing spaces
Refactor Admin::ImageController
Replace deprecated ActiveMerchant #type? call
Introduce Spree::Product#delete that set deleted_at value instead of
deleting the object
Refactoring state_text method
  eliminate nested ternary
  makes it nice and easy to read

[Fixes #1875]
Bug 800689 - Support modal dialogs (alert/prompt/confirm) from inline
activity frames; r=timdream, a=blocking-basecamp
Slider css fix
Removed -O0
Added fake login
*LoginThread Added
* Removed login check from SlashActivity to LoginActivity
ALLJOYN-1430 Assertion fails when repeatedlly Connect/Disconnect BusAttachment in Win8 App

1. Reset the thread function exited event, because a thread can be repeatedlly started, stopped and joined, such as IpNameServiceImpl.

2. In RemoveAlarm(), check whether the map is empty before calling find() on it.
Fixed Registry use in Client class and avoid including GeoIP and Browscap classes always.
I18N rebuild: if the translation doesn't exist the message and the translation are the same. Useful in languages related to English.
Merge branch 'experimental' into reintegration-experimental

Conflicts:
	libs/SEOframework/Client.php
Missing translation of parameters by default. This file is required by controller.php
Fixed connection to Redis.
-Non profile connections use domains.config.phh, profiled use redis.config.php
Normalized the CommandLineController classname and filename.
Fix getPage bug: array_push and array_pop don't flush the array internal counter.
Allow changing the public path of the generated and packed JS and CSS files
Emails are not sent
Corrected Command Line controller
Command Line Scripts throw now the exceptions and are seen in the console.
Added isPrivateIP method to Client. Allow the work with any IP, not only current.
Corrected private IP ranges
* Controller::setCacheExpiration() and the $this->cache_expiration attribute no longer exist. Return the "expiration" key instead in the array returned by the Controller::getCacheDefinition() method.

* The "expiration" key now works again. The expiration was being always overriden by the default one.
Added Keyspace class, for better key management in Redis
Minor changes. Removed useless function setCacheName
Delete Cache by tags now at Cache class level. Use it anywhere.
Paypal Notifier (IPN) Class
Cache by Tags
Merge branch 'master' of github.com:alombarte/SIFO
Add cache key info on Lock error
BUGFIX: Release cache locks when script contains an Exception, exit() or redispatch in the middle of the code.
Clarified a sentence in readme.
Mods on documentation
Added recaptcha.rb to ignore list
Added reCaptcha to the registration form. Cool. Closes #24
Fixing vim and vundle setup
Updated getDoubleArcPath in the PathFinder.
wiki: Properly render revision user.
wiki: Use ThingJsonTemplate for wiki json.
wiki: get_editors should return a list, not dict.
wiki: Use WrappedUser for wiki page settings.
wiki: Do not bother listing deleted editors.
wiki: typo.
wiki: Add requirement for alloweditor action to be del or add.
subreddit: Change logic for detecting a wiki friend page action.
templates: Use None as a default instead of {} for extra_config.
subreddit: whitespace.
wiki: Replace wraps_api with wraps.
wiki: Allow admins to create restricted pages, and mods to edit them.
wiki: Make settings for restricted pages less confusing.
wiki: Ensure that page names which can not be accessed are not created.
wiki: 'max_separators' should be lowercase.

down
wiki: Move required and fatal into prototypes.
wiki: Use a VWikiPageName.
wiki: Use VPrintable for reason edit reason.
wiki: Silently replace space with underscore in page name
wiki: Redirect on view if page name differs.
Updating to use key as id in the client
Added ssl headers to nginx config to fix ssl redirect loop
Updated production nginx config to match uat after testing it works :smile:
Argument to Add modified to div element
DIV element for special download deleted.
Download link fixed
Script added for downloading the last job calculated
updated database, 
fixed UTF8 bug in excel
IDI-33: Fixed the huge implementation and information cluster icon.
IDI-33: Fixed the layout problem with infrastructure page.
IDI-57: Put in a hacky temporary fix for the issue where the preferences button was getting pushed off screen when text size was maxed out in UIO.
Merge remote-tracking branch 'michelled/IDI-57' into development

* michelled/IDI-57:
  IDI-57: Put in a hacky temporary fix for the issue where the preferences button was getting pushed off screen when text size was maxed out in UIO.
Merge remote-tracking branch 'cli/IDI-33' into development

* cli/IDI-33:
  IDI-33: Fixed the layout problem with infrastructure page.
  IDI-33: Fixed the huge implementation and information cluster icon.
Merge branch 'development' into IDI-37
MYFACES-3663 UIViewRoot.createUniqueId() should generate unique ids for all the component tree.

git-svn-id: https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x@1421642 13f79535-47bb-0310-9956-ffa450edef68
WW-3946 prepares for release

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1422506 13f79535-47bb-0310-9956-ffa450edef68
calcRows calculates kenak tables (only for adiafani)
Fixed compilation error when ANTICACHE is not enabled
Let's try removing all of these
Problem: cannot compile c++ files into shared library: >_<
Add map asynchronous execution way
Fixed APSTUD-7217: JavaScript outline not linking line numbers properly.
Add more informative error logging for APSTUD-4762
java.lang.IllegalArgumentException: Index out of bounds in LineBackgroundPainter.paint()
- log the offset and length we're trying to invalidate
window status reflects mouse hover on page header
delocalize
Download all files (from file property)
Merge branch 'download-all-files' into develop

Conflicts:
	app/db.py
Merged tables user & user_profile
Merge branch 'develop' into new-user-handler

Conflicts:
	app/db.py
Replace entity #id hash with /id url
Bugfix
Show reference property values
trying to suppor mpl
aktualizacja prac, m.in. lepsze logowanie-raportowanie w konsoli
renamed server launcher
refined fixture count and added date generation to match fixtures
make sessions permanent with a lifetime of 1 year
add db expression wrapper
add db expression support to db.search order
fix username sort order
jslint: node.js support in windows.
Change Payback time's unit from months to years
Fix a valgrind error.

just use the receive buffer, as it will be big enough.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Upgrade the doxygen config.

The new doxygen says SHOW_DIRECTORIES is deprecated.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
No decimal places for values < GB
Load: fix viewing on FreeBSD/Mac OS X
xmppbots - they sign in, spam, but ZeroMQ not working yet; Akka is awkward.
init commit
Merge https://github.com/asperous/expat
update README
- added main script to be used from command line
- renamed sphinx output directory to output from build
- removed disabling of plugins, as implementation was trivial and not used
- documented vice.PropertyDict and vice.plugins
Added tests for markdown-extra tables

A few simple tests for the tables as php-markdown defines them.
Only tables whose lines begin with a "|" are tested.
Added support for markdown-extra tables in the markdown parser

Only tables whose lines begin with a "|" are supported.
There are 2 warnings about unused variables when compiling.
Added skeleton of basic docbook reader.
DocBook reader improvements.
Got section and sectN tags working in docbook reader.
Got footnote working in docbook reader.
Handle blockquote tag in docbook reader.
Support superscript, subscript tags in docbook reader.
Got metadata working in docbook reader.
Implemented itemizedlist in docbook reader.
Rudimentary support for programlisting in docbook reader.
Removed unneeded clause for "title" in docbook reader.
Support orderedlist and ulink in docbook reader.
Implemented quoted in docbook reader.
Implemented literal tag in docbook reader.
Input files with .db extension treated as docbook by default.
Implemented abstract, constant, type, etc. in docbook reader.
Merge branch 'master' into docbookreader
DocBook reader:  Added comment with list of docbook tags.
Merge branch 'master' into docbookreader
Add some more links to the documentation index page.
Merge https://github.com/defnull/bottle
PG: use write_info to set snap_collections in make_snap_collections

Signed-off-by: Samuel Just <sam.just@inktank.com>
PG: Place info in biginfo object

purged_snaps can grow without bound, and the filestore doesn't
provide unlimited size collection attributes.

Added CEPH_OSD_FEATURE_INCOMPAT_BIGINFO to prevent downgrade.

Signed-off-by: Samuel Just <sam.just@inktank.com>
more in changes
dict.pop fix
tutorial run-through, check, and edit
Change channels_groups endpoint to channel_groups
Add filtering and ordering to the channels endpoint
Fix build error on ChannelController bean
Add @PostConstruct and @PreDestroy methods to ChannelController
Add filtering and ordering to the channels endpoint
Fix build error on ChannelController bean
Interpret IDs correctly in the ChannelController
A few fixes:-

1) Order before pagination
2) Change package parameter to platform
3) Media type should be accepted as lowercase
Rename Channel.availableOn to availableFrom in simple model
Added type extension to v4 topic controller.
'mastermind'
'mastermind'
Update branch-3.1
sshd_config is too convenient not to have in here, might even be safer to ensure it's consistent

I know this is a security risk that I wouldn't advise to anyone.
created basic composer.json file
Fixed markdown typo in guides.
player list;
added admin list
minor fix;
added creating administrator;
copyrights;
added server side searching(limit offset ordering);
tournaments creation;
tournaments creation;
added portal menu;
update copyrights;
Removing params from router middleware
Add validate_string_list function.
call UnloadContent() upon exit
also apply master volume to Volume property setter
updated for version 7.3.623
Problem:    Perl 5.14 commands crash Vim on MS-Windows.
Solution:   Use perl_get_sv() instead of GvSV(). (Raymond Ko)
Added tag v7-3-623 for changeset a46a101bfddd
updated for version 7.3.624
Problem:    When cancelling input() it returns the third argument. That should
	    only happen for inputdialog().
Solution:   Check if inputdialog() was used. (Hirohito Higashi)
Added tag v7-3-624 for changeset 06749e351b1c
new recipe: Rotweinkuchen
Updated Nvelope.Reactive to use Nvelope ...13
Log Message-ID in header stage
JSON as form descriptive language, many fixes
JSON as form descriptive language, many fixes
JSON as form descriptive language, many fixes
Add basic groups stuff
axis labels
Merge branch 'master' of github.com:bbcf/bbcfutils
correct typpos
Bug fix: Temporary variable overwrites variable in symbol table (Issue #91)
Fix case-sensitivity issue of autoloader
Minor indentation adjustments
pkgdb_load_deps: Avoid looup reponame if not needed, and return sooner if already have fetched pkg dependencies
pkg-rquery: Initial implementation
pkg-rquery: Add -r reponame support
pkg-rquery: Add %R for displaying name of repository
pkg-rquery: Enable reverse dependency lookup
Add configuration and scripts. Still rather messy
noterm refactored to own project
intelligent parentheses parsing
intelligent parsing done
refactoring to eliminate nested ifs/cases
Fixing probe subsetting
fixing conflicts for test_selector
Using fixed indices for test_selector
Removed forgotten getRandom
Fixed rownames -> NULL; added progress messages
Merge branch 'master' of github.com:benilton/oligo
Addressed issue in which probes without chr info would be removed from pmChr
GitHub -> BioC svn
GitHub -> BioC svn
Merge branch 'master' of github.com:benilton/oligo
Fixing conflicts on transition to BioC 2.10
Smaller conflicts in unitTests: transition to BioC 2.10
Merge branch 'master' of github.com:benilton/oligo
Merging with release: unifying vignettes
fix conflict again
Allowing pm<- mm<- to work with additional args
Bumping version for pm<- mm<- transition
Fixing generic for pm<- mm<-
Fixing order of arguments and docs
Fixed order of arguments in setReplacement for pm/mm
go I know I love you but this is python
ctrlp config, add tagbar
Fixed (most of) PEP8
Minor ExpansionBridge change
templating scheme for single page
Blank layer in maps
Additional q&a updates
Support for optionally configuring keepalive on TCP connections to memcached servers.

Conflicts:

	History.md
	lib/dalli/server.rb
	test/test_synchrony.rb
Added weblogic domain creation
C,H,M,L Message decoding for ELV MAX! Cube added
new implementation of slide action buttons #17924
remove unused enum; proper sound touch events
implement momentom to slide action buttons #17924
center slide threshold #17924
remove unused variable #17924
slide animation refactoring #17924
cancel slide buttons on other slide or scroll #17924
reenable cascade anim. in contacs/people #17924
applied design from mockup #17924
fixes from CR #17924
Merge pull request #37 from heracek/17924

Code Review for Job #17924
Merge remote-tracking branch 'upstream/master' into 17969
conflict resolution for heracek's commit
Attempt at adding horizontal CPU meters - doesn't work, needs fixes.
English version of Preference Pane support for horizontal CPU thermometers.
Still needs a little cleaning up, and other languages nib files need to be
updated as well.
Added treat warnings as errors switch to shaderc.
add updated_by_ip to params
apropado -> aprobado
Adicionando estruturas e arquivo initialStruct.cuh
Escrevendo os Structs no main.cu
Criando vários blocos retangulares, falta ler XML
Criando bloco de entrada manual de partículas, falta acoplar com XML
Creando o Big Particle pelos blocos. Na verdade a única coisa que interessa é o tipo, pois a posição será definido posteriormente
Liberando espaço alocado na CPU
Merge branch 'input' into output
Adicionando default4.dsml
Removed reverse method for total ranking list on dashboard. Total ranking list is now upright.
[+] changed README to an HTML version
[+] added the text of the GPLv3.0 license.
Renamed some classes to better reflect their intent
move ping model to checkPlugins folder

trying to adapt it for adapter pattern
introduce stat collections holder

this file should be proxy for stat collectors
remove trailing spaces
using stat collectors collection instead of just Ping
remove trailing spaces and add some newlines at the end of files
introduce dropdown plugin from twitter boostrap
introduce dropdown menu for selecting type of the check
using stat collector adapter
replace Ping stat collector with one that returned from Stat module according to checkType
add support for checkType when saving check
introduce checkType field
replace default Ping stat adapter with one that returned according to checkType field
introduce ApacheStat collector

cmd+c and cmd+v from Ping one.
added Arrow Model
Updated the alias regex so you can do :octocat: etc without the initial :o being replaced by :astonished:
Merge pull request #406 from grumpydev/patch-1

Updated the alias regex
Added a simple + or - in front of the user list headings to show if the are collapsed or not
Fixed formatting, ===, and replaced indexOf with $.trim
Merge pull request #407 from admsteck/issue398

Indicate collapsed user groups
Added support for emoji icons in notifications (ie. /me likes :chicken:)
Merge pull request #408 from waynedenier/emojiNotifications

Added support for emoji icons in notifications (ie. /me likes :chicken:)
Prevent commands from showing a user as typing
Fix style
Merge pull request #412 from admsteck/issue403

Prevent commands from showing a user as typing
Updated QUnit tests
Merge pull request #413 from admsteck/issue410

Updated QUnit tests
Fixed error margin to prevent text overlapping timestamp
Merge pull request #414 from admsteck/issue402

Fixed error margin to prevent text overlapping timestamp
Fixed css gradient for opera
Merge pull request #417 from admsteck/issue416

Fixed css gradient for opera
fixing issue #411 - please review: do we need to strip html tags before using the good ol' jQuery decode HTML entities trick?
enhanced fix for #411
moving comments to the relocated method. #411
#411 - added encodeHtml and decodeHtml helpers so prevent emoji from rendering improperly and continue to protect against injection.
if an image is stashable. @wadey
first version of dotfiles
Adding a :present option argument type and related error messages
Updated Italian translation. Thanks to Ercole Carpanetto
underscore dependency was somehow missing
Accidentally checked in node_modules
Merge
watch-tree isn't being maintained, so switch to a fork that is and fixes the ENOTDIR issue.
trying to get output on dev
- updating recmail with real template
- smaller test data
- adding envelope from
- support for go version 1 release
- updating for go version 1
modified feature branch
Merge pull request #2 from broach/feature-branch

modified feature branch
Back to development: 0.2.1
Readme changes.
Don't raise exceptions, write logs.
use FAI Sphere instead of WGS84 eath model for Paragliding Task
WGS84 can be enabled with flag in option.h
Save 200ms (on V1) of map drawing time when nothing of next task turnpoint is on the screen.
this is time of TranparentBlt on 800*480 screen.
A Game can have blank and null scores & time_left values
Omit score and time from the game creation admin.
Unique import
Adds interpolation for name, date and newsletter
Allow fake slaves in dev and staging