labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'master' of git://github.com/naparuba/shinken
Merge branch 'master' of git://github.com/naparuba/shinken
Merge branch 'master' of git://github.com/naparuba/shinken
Merge branch 'master' of git://github.com/naparuba/shinken
Merge branch 'master' of git://github.com/naparuba/shinken
Add unittest for libexec/external_maping.py.
Mark libexec/external_maping.py as being executable.
Move description into a doc-string.
Use raise SystemError instead of calling sys.exit().
Wrap long lines.
Update comments.
Open files in text mode and some clean-up.

* Open files in text mode (was binary mode)
* Wrap file operations with try/finally to ensure the file will be closed
  even on error.
* Dump json directly into the file, leaving out a unnecessary buffer.
* Some other code clean-up.
More robust input file format: ignore spaces around hostnames.
Ignore lines starting with `#` (= interprete as comment line).
Bump version to 0.2.
Fix typo in help-message and minor update to help-message.
Merge branch 'cleanup-external-mapping'.
Remove redundant code (command line options are parsed twice).
Group mailing related command line arguments together.
Add command line option to specify the SMTP-server and port.
2.0 IS it possible?
Update PC-FX controls
render page title in an H1 on every article page
Extended digital_pin_to_timer_PGM array in variants/leonardo/pins_arduino.h to include analog pins (fixed #1129)
Merge pull request #1132 from cmaglie/issue-1129

Extended digital_pin_to_timer_PGM array for leonardo variant. Fixes #1129
mstor: implement NID stat

This is mainly useful for FUSE, to implement fstat().

Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>
editado nombres de accesorios
* tweaking anal sphincters\!
Fixed but where first child to function is defined, but None.
CHange to 25
Merge branch 'master' of https://github.com/colbyr/chesster
Further relative depth optimizations
Adding some notes on introspection to the cookbook
Remove nom_port from options. This should be infered by the controller name. Add a name member for that. For now, infer the controller from the commandline string'
port to new snapshotting code
Minor refactoring fix
Initiate the right SnapshotService from the config (WIP)
Minor fixes
Remove nom socket initiation. This is taken care of by the snapshotting services
remove hardcoded snapshot grabbing stuff. Taken care of by appropriate snaphsot service
Minor fix. (network_links is a list. Set expected)
starting a gem/dev files
add should to devDependencies
Another attempt to fix the timings merge, using the additional scenario
time if it is > 0
page history mails are also encrypted now
fix page history translations(date)
groups have calendar too
The user can now double click on items in the project view

I still need to connect the callback to the main sap_gui to
open up different windows
add ht op and capability IE defs
try to make things a little better

The ampe and meshd-nl80211 data is now split up into three structures
and global declarations:

/* AMPE stuff */
struct ampe_config ampe_conf;

/* mesh configuration parameters, also where config file is parsed into
 */
struct meshd_config meshd_conf;

/* phy / iface capabilities and status */
struct mesh_node mesh;

ampe_conf is now only known to ampe, and nlcfg stays in meshd-nl80211

The structs can be accessed in the following hierarchy:

ampe_conf->mesh->mesh_conf;

Could be nicer, and we cheat in places by accessing the global data
directly, but it's a good first step.
remove some reading
Updated wrong date on LICENCE
Updated README with better examples and driver parameter
Cont_p1_content.html renamed to Ign_1_content.html
search node by statusName
Added scores and setups to TextUI
Move lab 4 into a single directory
Factor uart_putchar() and write() into separate files
Setup I/O streams at compile-time instead of run-time

Use FDEV_SETUP_STREAM() to initialize stdout instead of fdevopen(); fdevopen()
requires linking in malloc() from avr-libc while FDEV_SETUP_STREAM() is a
static initializer.
Change main() to return int
Bug 809552 - [Email App] shouldnt have to place cursor for username before domain name. a=blocking-basecamp, a=requested-fix

These fixes were requested on https://bugzilla.mozilla.org/show_bug.cgi?id=816039#c15 by :Pike
Revert "Bug 824672 - Remove close button in error page, r=vivien,"

This reverts commit 0829fb5e2958aa687d676ec398b7049f0333e2d0.
Merge pull request #7222 from asutherland/fix-error-strings

Bug 809552 - [Email App] shouldnt have to place cursor for username befo...
Bug 823650 - showing Cellbroadcast information. r=timdream
Merge pull request #7207 from yurenju/issue-823650

Bug 823650 - showing Cellbroadcast information
Card UI work
Merge branch 'release/0.1.2' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
update plasm.js.manifest version: ready for publish
Merge branch 'master' into develop
fixed LineBasicMaterial
added Struct.extrude
added docs for curves
added docs for curves
Merge branch 'feature/docs-curves' into develop
bumped version number
Merge branch 'release/0.1.3'
iteration J2
finished new module parser (without trying it ;-)
Now correctly recreate the URI
Replaced all getHost/Port with getAuthority
Fixed the new URI("") and URI.create calls
Added boolean method to URI Resolvers to see if they support the server based authority
Added correct URI support to our SourceLocations.

* Correct encoding of unicode enforced
* Checking if host is supported.
* Removed a lot of duplication from the SourceLocationResult class
Performed massive refactoring to replace all URI constructors with the correct URIUtil call 
Moved static methods from URIResolverRegistry to URIUtil
Added documentation for the URIUtil class methods
Merge branch 'master' into fix-uri
Merge branch 'fix-uri', integrating the changes which should fix all URI behavior
janus submodule, homies
Remove records.config and alter config file creation

records.config is removed from the tar.bz2 and is only created when it
does not exist.
Template records.config, add throttle attribute
Fix for throttle variable
Fix not_if typo in trafficserver recipe
Merge branch 'refs/heads/develop'
Hm
Updated database.yml for production
Hm
Changed again database.yml
A little change
As default
Rolling back
Fixed merging
Merge branch 'develop'
Updated README.md
Fixed example on custom init
Merge pull request #2 from behere/patch-2

Fixed example on custom init
Removed some unused stuff. Added shortcut for full-screen.
Fixed rake counters
PPA 0.6.0.61-0ubuntu1 release.
Add logo and add background color to table header cells
Added desklets
initial dashbaord
fixed test
fixed failing tests for new resources
dashboard fixes
Massively refactored config saving and loading
added support files, ignoring proj file
merged dallonf 0.5
merged dallonf 0.5-config-loader
fixed and resolved conflicts in config-loader refactor
type loader
fixed missing body in parseBody
fixed bad callback params for resources
more integration fixes, resource crud
Added DELETE case to resources
basic code structure to support multiple types of compression
setUserBounds with POLYGON
Merge branch 'master' of https://github.com/danilogr/RepSys.git
Merge branch 'master' of https://github.com/danilogr/RepSys.git
Merge branch 'master' of https://github.com/danilogr/RepSys.git
Merge branch 'master' of https://github.com/danilogr/RepSys.git
Refactorizations in ErrorLogger:
- Implemented constructor for ErrorLogger::ErrorMessage that takes a callstack of tokens -> replaced duplicate code in Check and Tokenizer
- Implemented strigify() for ErrorLogger::ErrorMessage::FileLocation to replace two identical implementations of it.
Fixed crash when --errorlist is given (#3711)
Promjena baze u skis_razvoj
Added ignore doc/tags
Merge branch 'master' of https://github.com/vim-scripts/CSApprox
Merge remote-tracking branch 'origin/master'
ring-nonblocking.c
dave - added options stuff to edit javascript
dave - added options stuff to edit javascript
dave - added options stuff to edit javascript
Maven updates. Prepare for release.
Persistance and blacklist
Update sns/views/users.py
gold nugget
experimenting with background color.
BUG 4457: avoid "Creating default object from empty value" warnings
Criação de uma interface pública para visualização dos dados sistematizados
Add boxshadow to draggable
Center boxes in horizontal layout
Use textfill to adapt font-size. Won't wrap though
Merge pull request #4 from jzaefferer/master

Updates
Added files for week 2 assignment
Got queries showing up in a dynamicly built table
Better styles in views.
Made create form more bootstrap compatible.
Clean up show page.  Put the SQL into a 'hero' box.  Add striped and border classes to results table.  Move datatables JS to the bottom.
Add `std.traits.{isNested,hasNested}`.
Fix `std.traits.FieldTypeTuple` for structs.
Document what exactly `std.traits.FieldTypeTuple` do.
Add Issue 9127 workaround

* Issue 9127 URL: http://d.puremagic.com/issues/show_bug.cgi?id=9127
Refactor accounts urls, add musicbox url.
Add musicbox to INSTALLED_APPS.
Move profile url from urls to accounts/urls.
Add AppDirectoriesFinder to STATICFILES_FINDERS.
Display first 5 albums on homepage.
Add musicbox templates.
updated test-app
Remove previously-added math_integer
Cleared Errors 9:37pm
Fix #58
js2-mode-forward-sexp: Behave more similarly to `forward-sexp'

* Stop at node parens
* Signal scan-error upon reaching a parenthesized expression boundary
* If the buffer is dirty, reparse it synchronously

This increases compatibility with standard *-list commands, evil-mode paren
motions, and blink-matching-paren feature.

Close #56
Close #44

js2-node-rp: Fix for js2-elem-get-node.
js2-mode-forward-sexp: backtrack before signaling scan-error

* Jump past the semicolon when current node's parent is expr-stmt-node.
js2-mode-forward-sexp: Signal scan-error when start == rp
js2-mode-forward-sexp-parens: if/else and loop bodies are js2-scope nodes
js2-mode-forward-sexp: When inside "parens", jump over closest child node
Fix infinite timers loop

Refs #49
Clean up use of append and appendTo; add xlinkns property
Document poller code.
Extract AbstractExpressive superclass from Expressive.
PT-36153793 - Reconnect to mysql if it goes down
cfengine to start relay before proxy
XX-10466 - show update number in gui and if there are any rpms that are not from update
Fix FS config test failures
fixes for ISO install
Merge branch 'master' of github.com:dhubler/sipxecs
PT-41768247 fixed bug allowing Poly phone fw to be updated to unsupported fw version via group fw setting
Fix NPE on click to call on voicemail
XX-10096: sipxecs4.6- Not able to change the VM PIN

-use 12000 port which requires authentication to call REST api that changes user pin
user will get authenticated and pin changed
Revert "Statusbar updated"

This reverts commit d738d127050a75b3b5468aea5473f56ff94eec80.
fix check for domain and function name for gitparse
UPdated draw figure
escape model strings by default
Whitespace
Use extern for string constants
Ajustes verificacion cuaderno control
One more modeldict fix
Use XMLStreamWriter instead of XMLSerializer when possible
Merge branch 'master' of https://jptr@github.com/djbe/ElectroJam.git
Bump to 0.7.2 dev.
Fix the pipeline dependency name.

I got the wrong pipeline.
custom figure update
MDL-33987_M23 theme_anomaly: amended some css values to style dock better also removed exclude parent theme stylesheet as it refered to a none existant file in base theme.
MDL-34019 Fix response item key name
MDL-32062 question engine: fix re-grading attempts from 2.0

The code to upgrade attempts from before Moodle 2.0 to 2.1 created
attempt data that was not exactly the same as a new attempt created in
2.1+. This did not matter very much - revew and the quiz reports all
worked OK - but it broke on re-grade.

These changes detect the problem data in the re-grade code, an apply a
work-around so that the re-grade gives the correct result.
MDL-30883 question flags: aria attributes for accessibility

Also, update code to use html_writer, and fix pointer style when not
editable.
MDL-33780 question import: strip UTF8 BOM

Previously, if there was a byte-order mark at the start of the file, the
import would just break, which was silly. Much better to just strip it
off.
MDL-34008 formslib: repeat_elements replace {no} for submits & buttons
MDL-33453 Make it clear what search_references() and search_references_count() are good for

Initially it was not clear enough that these two methods are supposed to
be used for looking for references to a stored_file only. So the docs
comments are improved and unittests added to illustrate the usage.

The patch also removes the unittest for get_references_by_storedfile()
as its usage is already covered in other test methods.
MDL-32605 calendar: Fixing the missing parameter for get_string call
MDL-34025 - quiz secure window: fix popup closing
MDL-33924 quiz: incorrect foreign key definition.

Thanks to Jean-Michel Vedrine for spotting this.≈
MDL-31802: Remove section summaries from navigation_cache
MDL-34077 Repositories: Flickr and Picasa can have custom names
MDL-32297 Forms: Date Picker JS popup is not constraint to parent form
MDL-34045 fix invalid idnumber field type in cohort form
MDL-34115 fix sorting in blocks admin UI

Comparison of arrays is not locale aware.
MDL-33876 skip deleted users in enrol_database sync
MDL-34120 do not try to create new passwords for incorrectly deleted users

There is still some code that ignores delete_user() and instead hacks the user table directly, skip the borked user records for now when sending new passwords.
MDL-34121 drop unused backup tables that were supposed to be dropped long ago

The backup/restore leftovers that referenced these will be dropped in 2.4
MDL-34036 fix course role user selector
MDL-34123 use user's lang when sending new emails
Removed time_limit.py for sentiment analysis, justifying this by replacing the problematic URL regex with a better one from Daring Fireball.

Tweaked tweater startup script to make sure that GC Overhead Limit checking is turned off, as it doesn't seem to place nicely with long-running memory-intensive apps.
add EXECUTE grants for idoutils mysql setup description in README.RHEL.idoutils

refs #3192
dart-test commit
renaming again
renaming again
more sweeping improvements
added qr code with v-card
Add closure and function literals.
ViewController 삭제
Added index.html
Added home.html
addressed some of the issues
Eliminate unlikely transient blobstore TOCTOU bug
Merge pull request #677 from andrewgaul/transient-toctou

Eliminate unlikely transient blobstore TOCTOU bug
fixed missing provider name on ninefold test
consistent ordering of hardware
Issue 988:Extra port added to swift url
added min-disk to compute2.clj
Adjusting general strategy to accept @Named in place of @SerializedName.
Adding TypeAdapterFactory to handle deserialization based on constructor annotations (Inject/Named and/or ConstructorProperties).
Fix for iptonetworklist (was incorrectly sending ipnetworklist)
cloudstack: don't set networkId to default when iptonetworklist is populated
Merge pull request #678 from aplowe/master

Issue 971: adding TypeAdapterFactory and adjusting configuration to allow use of Inject, Named and ConstructorProperties annotations
Merge pull request #679 from aplowe/cloudstackfix

Fix for cloudstack ip to network mapping call
Issue 994: fix vcloud sax parsing of namespaces

Handles when xml tags are qualified with and without xmlns.
Issue 995: handle illegal argument in vcloud images
Issue 992: Fix AWS S3 to work with non-DNS, but still valid, named buckets.

Prior to this commit, jclouds wouldn't allow you to interact with any buckets
in S3 that were named with uppercase characters.  Per AWS S3 docs, this
non-standard naming is valid in US regions only.  This update fixes jclouds so
that it can interact with, and even attempt to create, buckets with uppercase
characters for AWS S3 without actually impacting other S3 implementations.  This
fix also will not have any impact in non-US regions other than instead of a
bucket name validation error you'll get an InvalidBucketName error back from
AWS S3 when you attempt to create a bucket with an uppercase character in a
non-US region.  To summarize, nothing changes other than US regions now allow
creation of bucket names with upper case characters and jclouds now can
interact with these non-standard named buckets without failure.
Merge pull request #684 from whitlockjc/master

Issue 992: Fix AWS S3 to work with non-DNS, but still valid, named buckets.
Merge pull request #681 from aledsage/vcloud-listimage-unsupported-exception

Issue 995: handle illegal argument in vcloud images
Merge pull request #682 from aledsage/issue-994-vcloud-npe-parsing-image

Issue 994: fix vcloud sax parsing of namespaces
Improve Maven build time dramatically by moving source and javadoc to profiles.

This makes a *huge* difference in build time (mvn clean install
-DskipTests takes about 1/3 as long with this in place). It moves
source and javadoc into profiles, so that if you want to build the
source jars and javadoc jars, you specify -Psrc and -Pdoc respectively.
Upgrading commons-io dependency of sshj driver to 2.0
Did a macro thang
work around regression in yui@3.5.1 Y.io()
Merge pull request #196 from drewfish/yui351-fixups3

work around regression in yui@3.5.1 Y.io()
lint
[fix #5496940] Changed all references to 'JSON' to 'Y.JSON' to avoid issues on platforms that don't have native JSON support
(cherry picked from commit f7ef439001b72e004e0a0015a10f1507c5d25991)
Fixed JSON call in a YUI 3.5 compliant manner
(cherry picked from commit a5172ccc3da8bc54200a5ea74da49aaf42425eea)
lint for bz 5496940
resolved this.rs and destructor() question
Updateded readme with AT&T Developer web site.
Minor changes.
Prevent trouble in the release (manual backport)
JBPM-3371-Terminate end event in subprocess must not terminate parent process, fix for incorrect parent process instance id in subprocess
Oh no!

He's ded.
Merge pull request #8 from drosticus/Ryan

Oh no!
Update create form instructions for allowing multiple dept/project/group IDs
if you mess this up start here
Filter out duplicate information.
Filter and map are not ALWAYS bad

- http://codrspace.com/durden/filter-and-map-second-class-citizens-in-python/
Tcp Communication Speedup
Fixed some bugs in dmnlib (back to testing machine). updated protobuf definitions. Preliminary serving of data vectors - just constants for now.
Better handling of tray menu disposal (for Gtk)
Added back express node_modules
switching to maven3 and flexmojos 4.2- beta
updating to latest Spring versions (unfortunately Maven build features a huge ugly stacktrace due to https://jira.springsource.org/browse/SES-98)
fixing flex compiler warnings
minor flex messages changes(cherry picked from commit 79612ed)
Merge remote branch 'dzamrozfork/master'

Conflicts:
	core-spring/pom.xml
	survey-spring/src/test/java/org/adaptiveplatform/surveys/acceptance/PublishedSurveysQueryingTest.java
	surveys-flex/pom.xml
	surveys-flex/src/main/flex/Main.mxml
	surveys-web/pom.xml
	surveys-web/src/main/resources/applicationContext.xml
release tool :)
new surveys-integration-tests project
generated server API (persistent)
Merge branch 'master' of github.com:marcinderylo/surveys

Conflicts:
	pom.xml
adding fallback flex locale pl_PL -> en_US
Adding a method in test to clean Jetty beans associated to the deployed apps to avoid blocking tests
Move Jetty cleaning method in common class and update of all tests to use this method
Completing tests, Add a try/catch block to avoid an exception if a given app port has no associated Jetty beans
add in edwins beautifully skinned karthus model
Update README
Switch to hash rocket syntax
Version increment
suppress warning
removed debug logs
boolean value
idea
update readme
init commit to create rails app
adding a rvmrc file
add git commands doc
Merge branch 'master' of github.com:codegreen/Redmoi
adding bootstrap
put ruby-readability in gemfile
merge
Merge branch 'master' of github.com:codegreen/Redmoi
update Gemfile.lock
Merge branch 'master' of github.com:codegreen/Redmoi
adding best practice
change to anjlab-bootstrap-rails, and add simple_form gem
rails generate simple_form:install --bootstrap
add config/locales/zh-TW.yml
remove public/index.html
setup time_zone and locale
add config/initializers/time_format.rb
create welcome#index for main page
create side block and add some more text
I'm an idiot..
Fix #89
Merge remote-tracking branch 'original/master'
remove old IE warning and add a bigger one for IE < 9
add an alert() for IE<9 on login
Merge pull request #98 from C4ptainCrunch/master

IE warning + ...
Updated finder-style bo2
Updated UX design of bo2 candidacies
Updated api for candidacies and candidates
Updated UX design of bo2 candidacies
Реализован турботаймер. Если на А1 появляется напряжение больше 2в. Начинается отчет времени и зажигатеся светодиод. Когда напряжение падает, светодиод гаснет через указанное время для индикации того, что двигатель можно заглушить.
Попроавлена ошибка вычисления периода вывода результатов измерения. Замеры напряжений вынесены из цикла ожидания.
В догонку.
Merge branch 'master' of github.com:elagin/carduino

Conflicts:
	carduino.ino
lumi
list of funcs from patches
proceed with T1
c vs l
point replacement; tweaks
fix broken tests

(1) EOF on buffer should be ignored (might be more in string)
(2) More information in error messages
(3) go fmt, and minor code move
added sdk lib and modified README
add pay sdk
Implemented object class name resolver. Closes #19.
Go should be finished!
Compilation README added.
Pass function removed from Pente.
Add 's' to 'extra'
Add niginx to PATH
Change "incremental search" to "incremental completion" to avoid confusion with isearch.
Fix dir list sort on linux
Commit changes to database while doing changes
Use DB to store last-seen data, so it will presist across restarts
Update templates/talks.html

+ Go workshop /w Steve
Merge pull request #116 from mokele/master

+ Go workshop /w Steve
list all gists, not just public
Add "float" type for scheme language implement.
Framework for admin/install tools, with ipa-ldap-updater

Currently, FreeIPA's install/admin scripts are long pieces of code
that aren't very reusable, importable, or testable.
They have been extended over time with features such as logging and
error handling, but since each tool was extended individually, there
is much inconsistency and code duplication.
This patch starts a framework which the admin tools can use, and
converts ipa-ldap-updater to use the framework.

Common tasks the tools do -- option parsing, validation, logging
setup, error handling -- are represented as methods. Individual
tools can extend, override or reuse the defaults as they see fit.

The ipa-ldap-updater has two modes (normal and --upgrade) that
don't share much functionality. They are represented by separate
classes. Option parsing, and selecting which class to run, happens
before they're instantiated.

All code is moved to importable modules to aid future testing. The
only thing that remains in the ipa-ldap-updater script is a two-line
call to the library.

First part of the work for:
https://fedorahosted.org/freeipa/ticket/2652
Make P2.6 and P2.7 default to GPIO
people don't need to be told which chatter they are, so remove the 'you' label
Initial project scratch
Work on invitations.
Merge branch 'master' of github.com:enspiral/loomio into feature/invite-system

* 'master' of github.com:enspiral/loomio:
  Added mini profiles to all usernames in discussion history
  Added mini profiles to the membership list
  Fixed mailto link/anything else inside popover clicking, now wont hide popover by default
  Refactoring hide/show popover into a method
  Popovers now hide and show correctly
  added some additional fixed
Merge branch 'master' of github.com:enspiral/loomio into feature/invite-system

* 'master' of github.com:enspiral/loomio:
  Improve test wording.
  Improve wording of example discussion.
  fixed list styles on context, discussion, and proposal
  text edit for tests
  included test
  fixed urls
  add mascot to group request page

Conflicts:
	app/models/group.rb
Merge branch 'master' of github.com:enspiral/loomio into feature/invite-system

* 'master' of github.com:enspiral/loomio:
  Increase capybara default wait time.
  Increase capybara default wait time.
Merge branch 'master' of github.com:enspiral/loomio into feature/invite-system

* 'master' of github.com:enspiral/loomio: (72 commits)
  Shorten time_ago helper text.
  Fix failing spec.
  removed spec as it is now incorrect behavior
  Added inline block to fix discussion-title display issues
  Revert "Schema"
  Schema
  Blue dot class update
  DIsplay subgroup discussion in parent group for logged out users
  wrong cancan ability for add subgroup
  make group request button a standard link
  ie8 spacing fix
  extend button width for ie8
  adjust padding
  completed helper
  Helper made for button
  conditional code added
  Change group requests admin page.
  Change group requests admin page.
  Style changes.
  see-more size increased
  ...
halfway there to working daily activity email
feature file passes completely. yay
emails looking good..ready to be reviewed
Update events rake task.
rename menu item.. maybe you wont like it
Language changes
Merge branch 'master' into feature/daily_activity_email

* master:
  Update events rake task.
Fix schema.
Revert "Work on invitations."

This reverts commit 48d69e2922f2469b7a7e2a27a9b6201500975fc6.

Conflicts:

	app/controllers/invitations_controller.rb
	app/models/group.rb
	app/views/invitations/show.html.haml
	db/schema.rb
	spec/lib/invites_users_to_group_spec.rb
Fix schema.
Fix group model stuff.
Remove unnecessary code.
Move letter opener out of test group.
Remove puts statement.
Remove shtuff.
Merge pull request #27 from enspiral/feature/improve-mailers

Feature/improve mailers
Try adding linebreaks to mailer template.
Second try at carriage returns. Replace old tautoko names with loomio.
Last attempt (hopefully) at linebreaks for mailer text template.
Last attempt (hopefully) at linebreaks for mailer text template.
Small aesthetic changes to mailers.
Make small cosmetic changes to mailer templates.
Fix failing specs
fixing error in user#group_requests
Merge pull request #28 from enspiral/fix_group_invite_list

fixing error in user#group_requests
Improve mailers
ability.rb: improve comment like permissions
ability.rb: improve permissions - edit group
Merge pull request #221 from enspiral/refactor/permissions

Refactor/permissions
completed helper
adjust padding
bugfix invalid text. bugfix system beep.
update about feedback recommend
update recomment text
Add command runner
Merge branch 'master' of http://github.com/epeli/vimconfig
update fsf address
update fsf address
refactored the tiles unneccesary imports  had been done
add homebrew configuration
Litles fixes for first functional sandbox project using Iron-G framework
update readme about encoding
Add files pryrc and powconfig
fix date show & commit node color
fix title & improved appearance
update json pour Max
properties ...
reglages conflits
GUI Annotations
...
Fin GUI Annotations
Integration Upload Fichier et Jtree
Ajout jar dans lib
Merge branch 'master' into AC4
Correction
Correction
ajout curseur pointeur sur les annotations dans le GUI
Merge branch 'master' of https://github.com/esi3G12/MarkESI into KH

Conflicts:
	MarkESI-client-web/nbproject/private/private.properties
	MarkESI-client-web/nbproject/project.properties
	MarkESI-server-interface/nbproject/private/private.properties
	MarkESI-server/MarkESI-server-ejb/nbproject/private/private.properties
	MarkESI-server/nbproject/private/private.properties
maj
edits
tester files
nettoyage options en double
Moved destroy buttons to edit forms
Add back missing file.(cherry picked from commit b7874456028496aa30101fb6ec4b142bd8593d95)
[JBRULES-3631] fix CCE when removing a rule containing a FromNode
[JBRULES-3632] traverse ObjectTypeNodes in a deterministic order
[JBRULES-3636] fix ConditionAnalyzer for complex constraints
(cherry picked from commit b3f5f6fe0cdfe401e369ceaaa509f12ad7602d1f)
[JBRULES-3630] load the Resources in a ChangeSet with the right ClassLoader
(cherry picked from commit 6e76710e0a419e171a752b08e43ded10324078c6)
[JBRULES-3562] rewire static methods implementing functions when MVELDialectRuntimeData is dirty
(cherry picked from commit adfc099434098549d320dd7737af3da5e96a9b29)
BZ-862325: removing the skipModify optimization to avoid bug
(cherry picked from commit 1a8db1048e51158994a0120f9cec9bba89253400)

Conflicts:

	drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java
Update ETS404.asp
add ex7.rb
add ex8.rb
Added example on VAR.jar / added tests for corner cases
Added wget to puppi prerequisites
Add an Anchor['puppi::is_installed'] which marks the point where all Puppi files are installed and before Puppi::Run. This works by having all classes or defines that deposit files to create a 'before' dependency with the anchor, and having Puppi::Run require this anchor.
Also removed the Puppi::Run first time lock thing. It never deployed my project automatically before i added all that
is_installed class moved to separated file
Remove useless implicit conversions
Fix encoding, still miss correct AHC encoding handling
PoisonPill based shutdown, close #454
Improve display on old ies
Merge pull request #809 from gcoutant/groups

Improve display on old ies
CAL-137 right click menu for today column
PLF-3307 : [IllegalArgumentException] commons-extension.war not found
SWF-2169, SWF-2170 : fill form values and display them after submit
JCR-1844 : The problem with stopping the cache is not shareable mode has been resolved.
[feature] Added interface for XQuery Functions and also allowed sequences to be passed as arguments
[feature] finished basics of exquery RESTXQ abstractions, at least now compiles, now need to check implementation
fix hplip scanning
feature #5
- Фильтр на главной странице готов
Added loading 'sqltype' from 'meta'
Fixed typo
Added validation and column logging
Added index on 'id'
Fixed update
Creating index once
Merge branch 'master' of https://github.com/mvoidex/carma-sync
Kiss
Another brick in the -Wall
Merge remote-tracking branch 'upstream/master'
made tabs into spaces
modified:   about.html
	modified:   index.html
	modified Web blog, change link, link to http://web-zy.com/updates/
Wrong calculation for network packets size
Removed gpg.
Add matplotlib 1.1.0 formula

matplotlib is a python 2D plotting library which produces
publication quality figures in a variety of hardcopy formats and
interactive environments across platforms. matplotlib can be used
in python scripts, the python and ipython shell, web application
servers, and six graphical user interface toolkits.
Add basemap 1.0.4 formula.

The matplotlib basemap toolkit is a library for plotting 2D data
on maps in Python. It is similar in functionality to the matlab
mapping toolbox, the IDL mapping facilities, GrADS, or the Generic
Mapping Tools. PyNGLand CDAT are other libraries that provide
similar capabilities in Python.
Improved Grips in both Viewports
upadte header/footer optimization
Added commentaries to the codebase.
Abort when the page model does not have a template_key field
fix values_list to return a queryset and fix

return with flat=True
add support fot querysets data to be other

memory query set
support many to many fields with through option
Explicitly setting the TERM in zshrc
Use data['html'] in all oEmbed calls.
Have `--pattern-{in,ex}clude` search descriptions
removed russian comments from objectstorage
Issue 5430 (Show @namespace rules inside CSS panel)
http://code.google.com/p/fbug/issues/detail?id=5430
Issue 4265 (Differences in logging with the same arguments)
http://code.google.com/p/fbug/issues/detail?id=4265
Manually updating the Computed side panel shouldn't be necessary
anymore.
Also show an image infotip on image inputs
修改企业编码为13为的错误
修正导入的时间转换，并且修复派件导入数据错位的问题。
取消派件新增的代收人身份证必要属性的验证。
修改公共比对，取消派件代收人身份证的验证
Merge branch 'master' of git@github.com:firefoxmmx2/jdy.git
Primer intento de entrega 4
[undo] Don't add keys by default, it causes unexpected results
don't have to override encode/decode since we aren't using *print-ordered*
added initial index.js file
add bag_config / Chris Roberts to the list of ideas.
Add links to the shows to the README
Item12180: Don't push a button; use internal code as intended

git-svn-id: http://svn.foswiki.org/trunk@16042 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Update app/views/layouts/spree_application.html.erb

Banner Fivefingers in sidebar
Improve the PredictableTransformComponent to smooth movement.

Signed-off-by: L5D <cholley.thibaut@gmail.com>
Merge pull request #460 from L5D/master

Move movement from input in plugin
Fix focusing

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Use int[] to save Color[]
Use less memory

Signed-off-by: L5D <cholley.thibaut@gmail.com>
Merge branch 'master' into secure
Fixed spelling errors
Fixed Spelling Mistakes
MFC 238311:
Add a clts() wrapper around the 'clts' instruction to <machine/cpufunc.h>
on x86 and use that to implement stop_emulating() in the fpu/npx code.
Reimplement start_emulating() in the non-XEN case by using load_cr0() and
rcr0() instead of the 'lmsw' and 'smsw' instructions.  Intel explicitly
discourages the use of 'lmsw' and 'smsw' on 80386 and later processors in
the description of these instructions in Volume 2 of the ADM.
MFC r236602, r236613:
Tune and add some missing CAM_DEBUG() points for better consistency.
Microoptimize time math.  As soon as our event periods are always below ome
second we may not add intereger parts by using bintime_addx() instead of
bintime_add().  Profiling shows handleevents() time redction by 15%.
Adding Git note for current refs/heads/projects/fuse
Document conditions for IP_SENDSRCADDR socket option.

Obtained from:	r167342 commit message


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240386 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Remove redundant check


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240387 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Add missing braces

Obtained from:	DragonFly


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240388 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Restore GPIO config quirks handling, lost during last big refactoring.

Tested by:	hselasky
MFC after:	3 days
Vendor import of BIND 9.8.1-P1
Remove empty directory in preparation for the 9.8.2 import
Vendor import of BIND 9.8.2
The BIND 9.8.2 tarball was re-rolled to remove 9.8.1 release notes.
This change was noticed by ISC at:

https://lists.isc.org/pipermail/bind-users/2012-April/087345.html

and verified by me both by comparing the contents of the old and new
distfiles and by verifying the PGP signature on the new distfile.
Vendor import of BIND 9.8.3
Upgrade to BIND version 9.8.3, the latest from ISC.

Feature Change

*  BIND now recognizes the TLSA resource record type, created to
   support IETF DANE (DNS-based Authentication of Named Entities)

Bug Fix

*  The locking strategy around the handling of iterative queries
   has been tuned to reduce unnecessary contention in a multi-
   threaded environment.

Other critical bug fixes are included.

All BIND users are encouraged to upgrade.
Add support for host mode to the DWC OTG controller driver.
The DWC OTG host mode support should still be considered
experimental. Isochronous support for DWC OTG is not
fully implemented. Some code added derives from
Aleksandr Rybalko's dotg.c driver.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240279 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Allow to specify no source-address-selection policy

MFC after:	1 week
Rework sample code which sets SSH_AUTH_SOCK to the user's ssh-agent
socket path if running

PR:		167932
Submitted by:	madpilot (pr)
Submitted by:	wblock (final patch)
Reviewed by:	If someone else reviewed your modification.
Approved by:	cperciva (implicit)
MFC after:	3 days
Adding Git note for current refs/heads/vendor/byacc/dist
A refinement of change 232351 to avoid a race with a forcible unmount.
While we have a snapshot vnode unlocked to avoid a deadlock with another
inode in the same inode block being updated, the filesystem containing
it may be forcibly unmounted. When that happens the snapshot vnode is
revoked. We need to check for that condition and fail appropriately.

This change will be included along with 232351 when it is MFC'ed to 9.

Spotted by:  kib
Reviewed by: kib
Adding Git note for current refs/heads/user/jceel/soc2012_armv6
Remove unneeded variable reported by gcc46 which stopped being used in
r234178.

Approved by:	cperciva
MFC after:	3 days
MFC r231187:
Update the 802.11s IE numbers to represent the latest 802.11 amendment
standard.

This update breaks compatibility with older mesh setups but is necessary as
the previous IDs are used by another amendment leading to unexpected results
when trying to associate with an accesspoint using the affected IDs.

Discussed with:	re
Tested by:	honestqiao at gmail dot com
Fix a few issues with transmit handling in em(4) and igb(4):
- Do not define the foo_start() methods or set if_start in the ifnet if
  multiq transmit is enabled.  Also, set if_transmit and if_qflush before
  ether_ifattach rather than after when multiq transmit is enabled.  This
  helps to ensure that the drivers never try to mix different transmit
  methods.
- Properly restart transmit during resume.  igb(4) was not restarting it
  at all, and em(4) was restarting even if the link was down and was
  calling the wrong method if multiq transmit was enabled.
- Remove all the 'more' handling for transmit completions.  Transmit
  completion processing does not have a processing limit, so it always
  runs to completion and never has more work to do when it returns.
  Instead, the previous code was returning 'true' anytime there were
  packets in the queue that weren't still in the process of being
  transmitted.  The effect was that the driver would continuously
  reschedule a task to process TX completions in effect running at 100%
  CPU polling the hardware until it finished transmitting all of the
  packets in the ring.  Now it will just wait for the next TX completion
  interrupt.
- Restart packet transmission when the link becomes active.
- Fix the MSI-X queue interrupt handlers to restart packet transmission if
  there are pending packets in the relevant software queue (IFQ or buf_ring)
  after processing TX completions.  This is the root cause for the OACTIVE
  hangs as if the MSI-X queue handler drained all the pending packets from
  the TX ring, nothing would ever restart it.  As such, remove some
  previously-added workarounds to reschedule a task to poll the TX ring
  anytime OACTIVE was set.

Tested by:	sbruno
Reviewed by:	jfv
MFC after:	1 week
This commit was manufactured by cvs2svn to create branch 'RELENG_2_2'.
Merge from -current.
Fill in BIOS geometries in struct bootinfo.
Merge from -current.
bin/1942 curses problem in systat
truncate if too long for field.
Merge from -current.
Back out daemon.* addition, ssh port should be fixed instead
Set the BUILDNAME, RELEASETAG and fix a bug Joerg found a couple of seconds
before me.
Set RELDATE=199612
Merge from -current.
Merge from -current.
Fix the hanging keyboard problem under Xaccel. Apprently we are loosing
an interrupt somewhere. The solution here is to check for keyboard
input each time the screen update timer ticks. Not pretty, but works.
Merger from -current.
Merge from -current.
Merge from -current
Merge from -current.
Merge from -current
Merge from -current
Merge from -current
Merge from -current
Merge from -current
Merge from -current
Merge from -current
MFC r239962:

Fix a twelve year old bug in readelf: when process_dynamic_segment()
encounters a DT_RUNPATH entry, the global dynamic_info[] array is
overrun, causing some other global variable to be overwritten.

In my testcase, this was the section_headers variable, leading to
segfaults or jemalloc assertions when it was freed later on.

Thanks to Koop Mast for providing samples of a few "bad" .so files.
This commit was manufactured by cvs2svn to create tag
'RELENG_2_1_0_RELEASE'.
Reenable unsolicited responses on CODEC if hdaa_sense_init() called again.
This fixes jack connection events handling after suspend/resume.

PR:		kern/166382
MFC after:	1 week
General improvements

* Replaced YAML configuration file with environment variables
* Added Procfile for foreman/Heroku
* Added YARD documentation
auswertung tomo
bevor ich es kaput mache
bevor ich es kaput mache
mehr auswertung quanten
Merge branch 'master' of github.com:freiwa/PhysikFP
files_exists() -> missing_attacks()
login url should be /login
Contacts finished

finished only to add conts types and chaeck were to free the memory
More ball replacement, use bold for servers that are part of the ensemble
removed - from example names
TEST-1 Nu jadrar
few urls and paths fixed due to change in $_SESSION values
final version submitted to arxiv
[BUG]: symlinking /root/.novarc to /root/openrc for backwards compatability
rm netbeans project
First commit. It works.
added a user sign up page and reorganized the site layout into
'layouts'
Look for error pages in templates/pages/error.rhtml
Added F# Concordance
better fix for jQuery problem with civicrm, minor style changes for Yes/No Terms radio labels, fixed custom module js
progress: json to server - convert into object - write yaml-file -
return answer object signaling error or success - if success: show the
sent data (as table)
store the model ids created for easy access #tmooney
Whitespace.
Return a true value.
look for COUNT= in vep annotation for mutation-diagrams

COUNT= will specify the frequency of the allele, which is how many dots
to put on the plot.
fix font-size in table
removing slickgrid
remove the slickgrid css includes
Changed comments to clarify the issues with serialization/unserialization
Changed comments to clarify the issues with serialization/unserialization
Formatted using IDE to prevent excessive white space
Jump to cache-storing instead of returning
ZF2-536 Fixed keys for VALUES_MERGE in Db/Sql/Insert
Zend\Db Added unittests for more code coverage
Zend\Form Added extra unit tests and some code improvements
- Fixed FormCollection::shouldWrap function
- Removed Duplicate code FormElement::render line 173 - 176 === 178 - 181
- Moved check for name to static getName FormMultiCheckbox::render
- Improved readability Zend\Form\Form::setValidationGroup
Error handling in AbstractWriter::write using Zend\Stdlib\ErrorHandler

Generalizes the use of Zend\Stdlib\ErrorHandler in all concrete writers
while at the same allowing to turn off that feature by calling
setConvertWriteErrorsToExceptions on any instance (which makes it safe
to use any Writer inside a custom error handler).
Update library/Zend/ServiceManager/Config.php

Refactor; Improve readablility.
Updated git instructions

- Indicated purpose of each branch
- Updated pre-commit
  - do not run for whole framework; loop over files in commit
  - omit deleted files
  - skip non-php files
  - run linter first
Update library/Zend/Mvc/Controller/AbstractController.php

Redundant check.
zend-inputfilter already requires 

zend-filter , validator and stdlib. So not adding others.
Update library/Zend/Db/Metadata/Object/AbstractTableObject.php

Typo
PHPDoc params in AbstractTableGateway.php

$table->methodName($where) must allow same parameter types as wrapped methods
Merge branch 'unittestForm' of https://github.com/kpieters/zf2 into hotfix/2361

Conflicts:
	tests/ZendTest/Form/Element/SelectTest.php
	tests/ZendTest/Form/FieldsetTest.php
	tests/ZendTest/Form/View/Helper/FormRowTest.php
Merge branch 'hotfix/2361'

Close #2361
Merge branch 'writererrors' of https://github.com/lowcoders/zf2 into hotfix/zf2-541
[#2370] CS fixes

- Trailing whitespace
- Braces
Merge branch 'hotfix/zf2-541'

Close #2370
Merge branch 'patch-1' of https://github.com/gerardroche/zf2 into hotfix/2372
Update notes for submitted changes

* run mergeMessageFileList.php as 'mwdeploy' user
Update notes for submitted changes

* (bug 39701) beta: automatic MediaWiki update
Revert "Eliminar sistema lpr BSD para Windows en FLPosPrinter"

This reverts commit a8038d7243b80a46b26cc8003e76a8592605c74a.
Merge branch 'master' of github.com:Aulla/eneboo
Merge https://github.com/gestiweb/eneboo
Al mostrar los FLFormDB algunos salian en posiciones incorrectas
dbadmin implica debugger
Add snippets for Kohana definition and PHPUnit
adding post adding final
Implement (dirty and hacky style) a way to handle the psp utility dialogs in win32. Disabled by default.
Made the dialogs return immediately with the specified default value.
network connect ongoing
keyword autocomplete test
change mark to emotion at 1
change 'test'to'テスト'
Exclude everything from ext/src from all builds
Prohibit trailing slashes in repository names (issue 104)
Adjust repository search to handle foo.git and foo/bar.git (issue 104)
Внесение
correct bugs in topIterator parse function, column iteratar basic recursion now working
Le boss n'apparait plus de manière aleatoire, mais après NUM_ENEMY_PER_LEVEL ennemis basiques
fixed template for color and TODO because they are done
Python Power instead of RegEx
Fixed CPU plugin
Added Disk plugin
TAChart: Fixes for TDataPointDistanceTool in xor drawing mode and with partial visibility

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@38335 4005530d-fff6-0310-9dd1-cebe43e6787f
Converter: fix compilation of r37646

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37648 4005530d-fff6-0310-9dd1-cebe43e6787f
translations: German: updates from Swen Heinig

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37843 4005530d-fff6-0310-9dd1-cebe43e6787f
remove a copied line from orderedditc.py
Fixed allocator (:facepalm:), fixed printf() a bit.
Script for analyzing include dependencies.

Add a Python script plus some CMake code to run it that analyzes include
file dependencies.  The script can also generate different kinds of
include dependency graphs (this implementation dates from a time when
some versions of Doxygen didn't do this properly, and the script still
has some features that Doxygen doesn't have).  Some parts of the script
contain hard-coded stuff related to the Gromacs source tree layout or
the Doxygen guidelines, but the core dependency analysis should be quite
general.

There is a lot to improve in the script (in addition to missing
features, docstrings and comments are sparse, and some parts could be
better structured), but it is already usable.

Fix a few issues that produce multiple warnings from the script, and one
issue found by the script (in helpformat.h).

Related to #638 and #907.

Change-Id: I22a6d6c0818f21c828f1e7d6beb1fdada39273d2
Merge "Script for analyzing include dependencies."
Speed up mdlib compilation by reordering file globs

Change-Id: I5672fe6001b19e872636a06c6ed15281e00d0ab2
Add grn_proc_get_or_add_var()
test: add missing double quotes to JSON keys
Add grn_tokenizer_have_delimiter()
Set retmode and rettype for all supported databases
fix content parser
Further post-deploy hook work

 - create backend persistence layer to create, update and delete hooks in MongoDB
 - add trigger to response to completed deploys
Removed stray comments
Implementação de datepicker
Exibe mensagem de erro quando não há horários livres
Remove TODO mutreta
Implement Array.zip using a single reduce step (systemfault).
Options to choose/run action
Debug auto to player 0
Added inPlay attribute, card functionality once in play
Removed "actionSpaces" idea, use Card.canTakeAction instead
Bugfix for if play method is not present
Changes in Logic for dealing with CurrentPlayer/StartingPlayer and handling actions
Placeable bugfix in get with prefixes
A few default cards for testing
Setters/getters for Current/Starting Player
Logic for this player doing an action
Sorted out meeple/actions to be playable for now
Merge branch 'actions'
add user columns to omniauth
Should cover most of issue #2
Adding more functions to solve issue #2
Adding screens which fixes #2
Merge branch 'master' of git@github.com:gustavlrssn/KEA.git
update to rspec2
20121031
Parameterize trace logging.
Add support for C++ and Fortran code
Renamed DLL tests
Documentation improvements
Remove is.loaded in favor of is.loaded_pkg
Merge branch 'cpp'
Change: functional feature of type operator replaced by operator named "instance"
commented code base
src/Makefile: removed