labofsahil/github-event-dataset-2012 huggingface dataset:
change tab into project.py
polish project.py
Merge remote-tracking branch 'master_bernard/master'

Conflicts:
	pylayers/util/project.py

resolve conflict into pyproject
Revert "polish project.py"

This reverts commit e6176aa687dc06a219ab71be4866209d2aa7eb9f.

Conflicts:
	pylayers/util/project.py

solve conflicts
Merge remote-tracking branch 'master_bernard/master' into devel

Conflicts:
	pylayers/util/project.py

resolve merge issue
test
Merge remote-tracking branch 'master_bernard/master'
solved project conflict
Conflicts:
	pylayers/util/project.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	pylayers/util/project.py
Merge branch 'devel'

Conflicts:
	pylayers/util/project.py
Merge remote-tracking branch 'master_bernard/master'

Conflicts:
	pylayers/util/project.py
Update:
- agent.ini default file
- project.py check if a newer ini file is available
Merge pull request #6 from niamiot/master

new ini + minor change in project.py
Update README.md

Added missed dependency for build -> pgrep
http://burgua.org/post/29064784750/open-source-textmate-2
capture errors
Main export is ./lib/samsam.js
holds heading with rudder
Fix incorrect expiry of sessions.

Fixes #3088
Change named capture group syntax.

This increases compatibility with really old version of
PCRE used on CentOS.

Refs #GH-681
[z1839] creature_linking_template updated.

Signed-off-by: TheLuda <theluda@getmangos.com>
- Removed ancient database updates.

Signed-off-by: TheLuda <theluda@getmangos.com>
[z1840] Cosmetic improvements for creature_template table.

Signed-off-by: TheLuda <theluda@getmangos.com>
- Script bindings expected in "scripts" subdirectory.

Signed-off-by: TheLuda <theluda@getmangos.com>
- Removed old universal bindings.
- Removed old contrib projects.

Signed-off-by: TheLuda <theluda@getmangos.com>
- Unified file headers.

Signed-off-by: TheLuda <theluda@getmangos.com>
- Applied coding style.

Signed-off-by: TheLuda <theluda@getmangos.com>
- Synchronize framework with mangos-one.

Signed-off-by: TheLuda <theluda@getmangos.com>
Merge branch 'master' of git://github.com/mangos-zero/server
Merge fix
Merge remote-tracking branch 'mangoszero/develop'
ScrollIntoView fix for IE
JSLint
JSLint
Shorter tree in the example to test the scrollbar
Merge pull request #180 from pgiraud/tree_scroll

Tree scroll fix for IE
Add support for SAE J1939 PGNs 65001-65030 as used by Maretron ACM-100
Playing with benchmarking pub/sub.
Merge branch 'master' of git://github.com/imatix/zguide
CARROT-854: Examples of calling the DCS using Javascript/AJAX
Add the #render DSL method
Add the cirrus:init internal task
Add the cirrus:rbenv:init internal task
Add the cirrus:rbenv:install task
Add the cirrus:chef:init internal task
Add the cirrus:chef:server:install task
Add the cirrus:chef:client:install task
Add the cirrus:chef:knife:setup task
Removed duplicates from array of emails.
Partial redesign of avatars.
Fixed inheritance hierarchy; changed posts and comments into media lists
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/group_view.html
Beautified Cell Renderers and Tables
Added a better color scheme to the cell renderer as well as modified the
look of the JTable with a new CustomTable class.
Converted PackageManager to PackageServiceImpl
Demos sources and Component sources were sorted. Icon component was changed. Resources files now are included into project. Removed unnecessary images and moved others to Resources folder.
Restructed db code

Removed _da module and instead use funs and 2 calls in _server to
execute db code.
Print a breakdown of the distance. 
Explicit alpha.
BUGFIX Returning File->getTreeTitle() with user input XML escaped, mirroring functionality in SiteTree->getTreeTitle()
BUGFIX i18nTextCollector finds templates recursively, not only in <module>/templates folder. Added master language entities which were previously overlooked due to this bug.
MINOR Using PHP version constants rather than version_compare() in Object::static_lookup(), since its called 10k times on an average CMS load that makes a difference of about 3% (with APC)
BUGFIX Don't' set 'Referer' header in FunctionalTest->get()/post() if its explicitly passed to the method
SECURITY Return true for Director::is_absolute_url() checks if they're prefixed with two or more slashes (as browsers interpret this as a valid URL)
SECURITY More solid URL checks in Director::is_site_url(), using a conservative parse_url() hostname comparison rather than Director::makeRelative(), which is not designed for security purposes
Merge pull request #3 from chinuy/master

golden
fix
replace by *.wav file
1. add game difficulty
2. fix key_move
worksheet
merged conflicht
xmldematerializer
xmldematerializer
Re-add the ability to select the PowerPC SHA1 function
Added compilerOptions option
Fixed naming for automatic github binary upload.
- replaced "now" with timestamp
- changed format to the US format
[ci skip]
added item_info (serialized hash) to keep some metadata on items
seed data pulls item_info metadata (rudin eq, ch, etc); implemented search filters, fixes #7
need to link the benchmark library.
Views/Infovis  module .....
revised 3.1
Added automatic schema creation, updated text
Fix generic corrupted block oracle database check
Implemented basic ability parsing
Shifting first byte of identifier by 8 places.
Merge remote-tracking branch 'upstream/master'
Item6904:Enhancements for UserMasquerading and WebAdminForWebAutonomy

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@23083 a00a5322-12db-0310-a70b-8735589c885e
Item6916: feature and documentation refinement

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@23443 a00a5322-12db-0310-a70b-8735589c885e
Item6831: Feature and documentation refinement. See details on TWikibug:Item6831

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@23444 a00a5322-12db-0310-a70b-8735589c885e
Item6960: interanctive evaluation feature on TWiki.SpreadSheetPlugin improved a bit.

git-svn-id: http://develop.twiki.org/svn/twiki/trunk@23514 a00a5322-12db-0310-a70b-8735589c885e
add collections getsize test
fix NPE on InputCollection getSize()
Merge remote-tracking branch 'upstream/master'
fix type inport type
merge with the pull #30
Resolve an exception condition on checking the size of existing but empty PCollection
Merge pull request #31 from tzolov/master

Resolve an exception on getSize for existing but empty PCollection
Removed white_controller
Merge branch 'release/v1.3'
BUGFIX - Issue #252 - fuzzy match on lvs name returns a false match preventing LV creation
Some changes for testing
Merge branch 'master' of git://github.com/cobbler/cobbler
Merge branch 'master' of git://github.com/cobbler/cobbler
Merge branch 'master' into issue_252
Merge pull request #292 from jimi1283/issue_252

BUGFIX - Issue #252 - fuzzy match on lvs name returns a false match preventing LV creation
last build status image help added
Merge branch 'master' of github.com:coconut-ci/help
Changed: sending message in demo refs #1223
Added config file for Launch4J.
Minor changes to L4J config file
fix bug with capture handlers
Specify NLS_TIMESTAMP_FORMAT for ORACLE support
Bug fix : upgrade mockito 1.7 en 1.9.0
Merge branch 'integration' of https://github.com/codjo-sandbox/codjo-sql into integration
Merge pull request #4 from codjo-sandbox/integration

Oracle support - Specify NLS_TIMESTAMP_FORMAT for oracle connections and mockito upgrade
Switch parent pom to the last codjo-pom stable version
[maven-release-plugin] prepare release codjo-sql-2.43
[maven-release-plugin] prepare for next development iteration
Switch parent pom to the codjo-pom snapshot version
Better management of managed manager
no more keys that are not keys is the key to success
oops
Fixes here and there
Blop
new util package
md5 for files, as easy as in PHP..
Use php's md5!
Need to recompute hash after writing to file
Hell yeah that's fast!
Use a single lucene writer
test: fix spurious failture of 001 002

Signed-off-by: Liu Yuan <tailai.ly@taobao.com>
Signed-off-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Fix link to user profile from user likes
Vim shenanigans, part i
Vim shenanigans, part ii
meet nodejs and support doctype parsing
I made a mistake.  For some reason or didn't work and I needed to use ||
moving the .h files to an include directory and making them install with the library

Signed-off-by: Tigerbot <slgibelyou@gmail.com>
Moar api implementation
调度逻辑完成
Moved the local class event emitter so it is instatiated with before constructing the object. Fixes #12.
Removed redundant namespace construction code. Fixes #13.
Cleanup
Update for npm
autosubmit: click on type=search only submits if value changed

clicking X on a type=search resets the value, but does not trigger a
change event. We handle that manually.
try testing geojson
fix error msg display bug
Add spec for transition field
Add transition field
Add transition and it's spec.
Transition has to be extracted by separate rest call
Merge branch 'transitions_support'
Pom and dependency update
Pom update
Updated to 3.0
Defaults now whitelist based except for use
Misc fixing
Added debugging listeners
Stupid static
POssible fix for apple eating prevention
connecting ui to scripts
more FOFN things
fine-grain lock
Merge branch 'master' of https://github.com/cse605/project1
Better block parsing validation.
Use a hash instead of a case statement for strand indicator.
More command line tool work.
Fixed EOL_OR_EOF to actually detect EOF, not end of line.
Catch a few more cases with comment handling, etc. in unit tests.
Fail fast on access to nonexistent sequences.
Try new block parser implementation.
continued shell tweaking
Additional validations on group ownership relations
adds authlogic for autentication
changing the config.php again
crumbs
added support/jquery.js
Added helper functionality and revised code for models and views

Models and views loading code has been revised to load more than one at
once. Also cleaned up some code when using arrays.
basic rakefile
Fixed the issue of the title being Undefined

It was setting the title to use response.title which was never actually
created. I also commented out the console.log that was in main.js as it
was causing errors in old versions of IE.
Added the option to ignore files in root.
tweaked form layouts
Starting Token Input for Search
Country Input Working
New Trip Form Country Search
Added Country Data file
Drawing refined
Add style guide

The style guide describes the formatting and naming conventions that
contributors to Postduif must follow.
Fix some text shadows
Correctly define DateHelper
Changed Cell to take in notebook so they can reference the notebook they
are in
got rid of test console.log
added get_code to supercede get_text for execute
refactor execute_cell, focus_selected, delete_all_cell
Update PRE iOS portfolio-general skip-track
Building out iOS filter view on Details
finished mobile filter layout.
paranoid updates
Added StringUtils helper class for slugs
Reduced code duplication between UDPPort and TCPPort.

I've done this deriving TCPPort and UDPPort from a common parent
NetworkPort that implements most of the functionalities.
TCPPort and UDPPort now implemets only the code related to the different
way of using SocketDescriptors 'connection' and 'listener'.
Make use of Token::findClosingBracket in templatesimplifier.cpp
Add a simple web server with websockets
Add a rolling graph to the web page
lba
Merge branch 'master' of https://github.com/dariuszz123/psi
Avoid JSON parsing of empty response body.

Addresses #505
Added native bind rendition
Updated 
Added forked rendition
Merge pull request #13 from datagutt/master

Fix createXHR rendition having double file ending
Merge pull request #11 from gibletto/master

Added native Function.prototype.bind rendition
renditions for getInnerSize and getOuterSize
fixed getStyleComputed
attachWindowListener renditions
added attach/detach bound listener
added delegate listener rendition
remove
fixed attachWindowListener rendition2 and added detach counterpart
added undelegateListener rendition
Merge remote-tracking branch 'upstream/master'
added toArray renditions
query renditions
added rendition for getPositionRelativeToViewport
Merge pull request #14 from adamsilver/master

Features and fixes get[Inner/Outer]Size, attachWindowListener and more
changed from 'viewport' to 'window'
fixed a few things and added rendition for getOwnerDocuemnt and getViewportSize
SI649 - Individual Day Selector

SI649 - Individual Day Selector
asociations added and bootstrap
Remove trailing whitespace.

Signed-off-by: David Celis <david@davidcelis.com>
changed collision box type on segway model to prevent dragging ground
accidentally disabled warning as errors
Major refactoring, closes #52
Added some color functions to evennia_color

Added functions to left/right/center justify, and associated things
required for the process like truncation and length measuring.
update for decoupled_consumer and consumer class

- add new option to configure redis host
- add consumer_name to development output
- send current consumer stats to redis
New Version Step for Redis include
Merge remote-tracking branch 'origin/development'
revised for another pull request
Upgrade to 6-7.
fixed brennan's horse shit colour shit fuck ass
Update javascript/lang/de_DE.js

Adding German language strings
New interface for scan

Is suppose to give a lot more control to the user, making it possible to
avoid some graphs that are hard to optimize, or which do not get optimized
properly. It is also suppose to generate much cleaner and small graphs.
add flag to ignore unused inputs to the new interface for scan
Remove tensor.__getslice__ to avoid sys.maxsize

When calling t[1:], for instance, the arguments passed to __getslice__ are
(1, sys.maxsize), which is a pain to deal with, and can even not be an int
(but a long).

If __getslice__ does not exist, __getitem__ is called instead, with argument
slice(1, None, None), which is much more desirable.

__getslice__ is deprecated in python 2.6 anyway.
Use sys.maxsize instead of maxint.

This should really be maxsize, but under linux and win32, both values are
equal. That is not the case for win64, though.

TODO: Maybe remove the special case for maxsize in slices, since no
new slice with maxsize should be produced anymore.
More reliable way to get platform's bitwidth

Previous code identified Windows 64 as 32-bit.
removed import of unused function traverse
added by default for nit_sot `n_steps` as number of steps

Now scan requires the user to say the number of steps. In case of outputs
that do not feed anything in, if the user does not provide any information
then it is assumed that you want all intermediate steps.
add test values to sequences slices as well
removed bug in the code

sequences are not a list of dictionary anymore, but a list of tensors,
the original tensors.
init_out is already a dictionary with the required keys
in the case of -1 scan does not do what is expected to with we remove the
node.
we can have extra inputs comming from the update rules
Comment is not useful anymore (we do not import cuda any longer)
same as ifelse to convert args into theano variables

I used to call as_tensor_variable which is not ok for sparse or
random generators
unused function
another test including sequences
Add comments
Fix type checking
Change NONE_CODE to use sys.maxsize.

This is temporary, as we should remove NONE_CODE ultimately.
pointer bitwidth and int bitwidth are different
corrected prototype for "ausgabe"
Merge branch 'master' of github.com:ethersex/ethersex
Merge remote-tracking branch 'upstream/master'
Improve ShozuTwigExtension usage and PHPDoc comments
Implement action() helper for Twig views
Merge pull request #15 from tjbz/tjbz/twig-improve

tjbz/twig-improve
renaming note page
changelog edited for 0.6.2 and directory structure changed to seperate source from packaging
Added "page.close()" and "page.onClosing = function(page){}" callback.

* Addresses [Issue 678](http://code.google.com/p/phantomjs/issues/detail?id=678)
* "page.close()" deprecated "page.release()"
* the callback "onClosing(page)" gets back the reference to the closing page - that can be ideal to have 1 handler for all the page that close
* It works both when closing directly the page, or if the page closes by itself
* If parent closes, child close too

Tests provided.
Adding property "page.ownsPages".

When set to "true", any page that gets created, is
owned by the "page" that control it's lifetime.
Also, the pages can be found in the "page.pages[]" array.

Default value is "true".

Addresses [Issue #151](http://code.google.com/p/phantomjs/issues/detail?id=151)
Fixing wrong parameters manipulations in "page.evaluateAsync".
Adding and Removing appropriate auto-completions (REPL).
Adding support for more Mouse Events.

Support for Mouse Events: Left-click, Right-Click, Middle-Click and Double-Click.
Addresses [Issue 712](http://code.google.com/p/phantomjs/issues/detail?id=712)
Adding "url" and some frame-related Q_PROPERTIES

* url - current page url
* frameUrl - current frame url
* frameContent - current frame HTML content
* framePlainText - current frame content in Plain Text (no tags)

Fixes [Issue #758](http://code.google.com/p/phantomjs/issues/detail?id=758)
Cleaning up some useless TODO left in the code.
Redesign the Cookies API

Addresses [Issue #761](http://code.google.com/p/phantomjs/issues/detail?id=761).

This is a squash of 5 commits.

1. Complete reimplementation of the CookieJar and the Cookie API - Part 1.

The save/load mechanism is inspired by the Qt Demo "browser".
More info: http://doc.qt.nokia.com/4.7-snapshot/demos-browser.html

2. Making the CookieJar a singleton.

We need to have multiple NetworkAccessManager to monitor the network activity of the page,
but we also need to maintain 1 CookieJar: in this way we now have a shared bucket of Cookies.

3. Exposing the new Cookies API to the JS space.

* Updated the completions.
* Ensured backward compatibility of the API.
* It's now possible to "phantom.cookieEnabled = false" to disable cookies completely.
* New methods: addCookie, deleteCookie, clearCookies

4. Provided some internal Doc for the new Cookies API

5. Ensuring the "page.deleteCookie(name)" method works only if a cookie name is given.
Enumerate some important changes for the upcoming 1.7.

http://code.google.com/p/phantomjs/issues/detail?id=764
ProductVariationMetaclass ignores proxy models when adding option attributes
removed dupe code
Bump Mezzanine version to 1.1.1
Merge.
Version bump to 0.5.1
Update auto-generated files: CHANGELOG, model graph.
Disable Eclipse format-on-save
Improve logging and debugging
Rename Connectivity to Connected
Add basic ball material transformer
#37 Added additional negative margin on code blocks within list items.
Added theme coloured favicons #30
#84 Removed margin setting on show/hide subnav for small width devices
Update README.md

Add information about embeddable HTML in the heading front matter.
Updated posts for showing non alphanumeric and html characters in post headings
Merged due to posts update in gh-pages
Merge branch 'master' of github.com:dharmafly/dharmafly-docs
#29 Changed reference link text to a variable
Add overview of editable reference section text
Merge branch 'gh-pages' of github.com:dharmafly/dharmafly-docs
#12 Added grayscale to background link icons. Removed on hover
Updated data uris from base64 encoded svg to escaped svg
#12 Reverted changes as border colour was also set grayscale
#84 Updated conditional comments for IE9. Was incorrect syntax
#84 Updated conditional comments for IE9/IE8. Was incorrect syntax
Merge branch 'gh-pages' of github.com:dharmafly/dharmafly-docs
#104 Updated misalignment on quote nodewing, by using a css calc value
Updated quote nodewing alignment to use left and right values and a modifier over small device width, due to lack of support for calc
#105 Added margin bottom under output code blocks.
Made code examples editable (removed bug repeatedly adding hijs.js)
Update config version format
Update project documentation
disable py26 tests since I do not have an environment for running them

Change-Id: I3be53ecc356374940c22dbbc13cfc09bc0613301
added gitignore
Merge branch 'master' of github.com:dhilipsiva/.vim
Optimised images some more
disable ssl when prop value is false
Load plug-in paths before starting cpx_supervisor
Use symlink when loading plug-ins
Merge pull request #86 from jvliwanag/symlink

Use symlink when loading plug-ins
Merge pull request #85 from jvliwanag/pluginpath

Load plug-in paths before starting cpx_supervisor
Merge pull request #84 from jvliwanag/webmgtconfig

disable ssl when prop value is false
Prevent openfire OOM - handle exceptions inside SqaEventHandler
move object filter function to swift_api

Change-Id: I189d624cb4646d1b2edb71f178922e606fff5f92
model模板开发（进行中。。。）

model模板开发
grafos...
add auto
ci...
ci,...
ci...
Updates for Batik plugin integration.
Merge pull request #1206 from easirois/B_MT1-6

Updates for Batik plugin integration with SVGImage in Plus plugins.
Some more experiments

So far:
* queues are named and persistent
* transport-level (ie TCP) connections can be bound to named queues
* when a transport-level connection is closed, the binding is lost but the
  queue remains

There's no way to
* actually destroy the queus themselves. It's unclear how their lifetimes will
  be managed
Application Beta

Version 0.21
messages & serialization
rewrote serialization framework & message handling
Add ignore file
Add ignore for production folder.
Ignore binary output.
Revert "test"

This reverts commit ecbcc278a5ab653a8436aa526cc222a77c1ee8ac.
Revert "Revert "test""

This reverts commit fe6479e399d0b18041121831290216a85b2bed36.
Revert "Revert "Revert "test"""

This reverts commit 39f8a39d2043ac144cd7b29312faa34a250475a5.
Updated layout structure. Implemented Bootstrap
switch to ctrlp
make preview open pdfs in latex-suite
quiet the ss alias
set javascript tab settings
make zsh track history much better
set everything to use the global ~/.gitignore
extracting category view to it's own file
Make the import class more flexible
Fix bug when using url() when importing - url was adjusted twice. Gave the Importer class 2 new options, InlineCssFiles which puts the css file contents in instead of leaving an import and ImportAllFilesAsLess which will interpret every import as being a less file. Also made the container factory easier to override so it would be easier to specify your own importer. This fixes #71 and fixes #151
adapter is always expected to have an error() method
Up bulksize.
Add index:delete.
Take a seq instead of a reader.
kwargs.
Allow bulk sources to override index & type.
Name nodes in relation to namespaces.
Remove properties overriding versions for this release
Set release version: 5.5.0.CR1 (jBPM 5.4.0.CR1)
Set next development version: 5.5.0-SNAPSHOT (Drools) 5.4.0-SNAPSHOT (jBPM)
Console examples, console choice class and formatter added
Typo in offline layout.
NODE_ENV in configure now defaults to development, which is consistent with express
Merge pull request #787 from MatthewMueller/master

io.configure('development', function() {...}) will trigger if NODE_ENV is not defined.
Getting ready for 1.0
Merge branch 'master' of github.com:LearnBoost/socket.io
More sensible close `timeout default` (fixes disconnect issue)
Release 0.9.2
Add disconnect from namespace test-case for issue #795
Fix issue #795
Firefox will try to parse the response from POST requests, causing a syntax error message in the Web Console. Basically an addition to https://github.com/LearnBoost/socket.io/pull/501
Merge pull request #806 from mixu/upstream/fix-ff-xhr-post-syntax

Fix "syntax error" message on FF, resulting from FF trying to parse the POST result as XML due to it not having a response content-type
Release 0.9.3
Merge pull request #809 from DanielBaulig/issue795-fix

Issue795 fix
Release 0.9.4
Merge branch 'master' of github.com:LearnBoost/socket.io
Release 0.9.4
Release 0.9.4
Log disconnection reason
Ensure that polling transports work with Connection: close
Fix disconnection reason being lost for polling transports.
Ensure close upon request close.
update the sound system each frame
Add script-based remote script node step plugins

for #246
Add documentation for interpreter-args-quoted

[#571]
Merge branch 'hotfix/v0.10.2'
Move ruby racer into assets group
Merge branch 'hotfix/v0.10.3' into develop
fixes connection issue
Merge branch 'master' of https://github.com/dw04/blinklicht.git
Add a carriage return at the end of each message sent, except $$$
This allows to configure the RN-41 BT module without interfering with BlueRC
fixed bouncy tile assets
Fix error in Entity::toEntity().
Cleaning and refactoring
Adding api for EasySOA Management service to instanciate ondemand app's on FraSCAti studio
Update easysoa-frascati-service
- Remove old RemoteFraSCAtiServiceProvider
- Add killInstance method in EasySOAApiFraSCAti
- Remove shared frascati's libraries to avoid conflicts
Merge remote-tracking branch 'origin/master'
last hack of the day: change connect; more communication issues to be solved tomorrow
This patch add Route 53 as new Dynamic DNS provider into dyndns infrastructure.
Due requeriments to handle requests to Amazon AWS API, it need root certificates package (ca_root_nss-3.12.4.tbz) and support to hash_hmac() in PHP (package php52-hash-5.2.13_3.tbz).
Add the stf0 interface to interface_has_gateway_v6() for 6to4
Add logic that (re)configures the dependent interface that has interface tracking setup for a tunneled IPv6 protocol.
Add interface tracking support for native dynamic IPv6 interfaces like dhcp6 too.
Correct the function name to reflect the RA daemon changeout
Remove suprious debugging line
A few more improvement such that tracking interfaces are automatically configured from the client interface
Comment out the srd 6rd device and put in the patched stf device commands.
Still doesn't work but Ermal might be able to debug easily
Adjust the firewall rules for 6rd and 6to4 proto 41 traffic
Ticket #2117
Add missing DHCP6 track6 support function
Fix the find dhcp6 process function to report the actual pid instead of the grep pid.
Remove spurious double debug line
Remove this file, it causes other issues
Adjust the DHCP6 client firewall rules
Reverse the echo request and echo reply for input and output filters
Open up the DHCPv6 server firewall ruiles
Correct the DHCP6 client function to reflect the track6 changes
Correct variable names and foreach assignment
We want to actually compress the IPv6 address, not uncompress.
Add quick to the DHCP6 client and server rules
Changeout the told dhcp-pd config for the new track6 style autoconfiguration of the lan interface.
Remove this track6 line as it causes an xml error
Drop tramp-default-method in settings.el
add v5 alpha
Fixing incorrect tests
Commented LSCOLORS
Reorganized tmux conf
dev: set default set size
Se agrega al str de proceso el elemento juzgado
complete eff weighting
tweak variations
draw again a configurable set of histsos
repeat relevant histos; reverse no longer needed
Added loading cancelation ability
Added function evhtp_unbind_socket

evhtp_unbind_socket stops listen socket, and deallocs all memomry
allocated by evhtp_new.

Valgrind with code:
int
main(int argc, char ** argv) {
    evbase_t * evbase = event_base_new();
    evhtp_t  * htp    = evhtp_new(evbase, NULL);
    evhtp_callback_t * cb;

    cb = evhtp_set_cb(htp, "/test", testcb, NULL);
    evhtp_callback_free(cb);
    evhtp_bind_socket(htp, "0.0.0.0", 8080, 1024);

    return 0;
}

==11359== Memcheck, a memory error detector
==11359== Copyright (C) 2002-2011, and GNU GPL'd, by Julian Seward et al.
==11359== Using Valgrind-3.7.0 and LibVEX; rerun with -h for copyright info
==11359== Command: ./test_basic
==11359==
==11359==
==11359== HEAP SUMMARY:
==11359==     in use at exit: 12,136 bytes in 57 blocks
==11359==   total heap usage: 60 allocs, 3 frees, 12,230 bytes allocated
==11359==
==11359== LEAK SUMMARY:
==11359==    definitely lost: 632 bytes in 1 blocks
==11359==    indirectly lost: 9,248 bytes in 9 blocks
==11359==      possibly lost: 0 bytes in 0 blocks
==11359==    still reachable: 2,256 bytes in 47 blocks
==11359==         suppressed: 0 bytes in 0 blocks
==11359== Rerun with --leak-check=full to see details of leaked memory
==11359==
==11359== For counts of detected and suppressed errors, rerun with: -v
==11359== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 4 from 4)

Valgrind with code:
int
main(int argc, char ** argv) {
    evbase_t * evbase = event_base_new();
    evhtp_t  * htp    = evhtp_new(evbase, NULL);
    evhtp_callback_t * cb;

    cb = evhtp_set_cb(htp, "/test", testcb, NULL);
    evhtp_callback_free(cb);
    evhtp_bind_socket(htp, "0.0.0.0", 8080, 1024);

    evhtp_unbind_socket(htp, 1);
    free(htp);
    event_base_free(evbase);
    return 0;
}

==11264== Memcheck, a memory error detector
==11264== Copyright (C) 2002-2011, and GNU GPL'd, by Julian Seward et al.
==11264== Using Valgrind-3.7.0 and LibVEX; rerun with -h for copyright info
==11264== Command: ./test_basic
==11264==
==11264==
==11264== HEAP SUMMARY:
==11264==     in use at exit: 8,216 bytes in 2 blocks
==11264==   total heap usage: 60 allocs, 58 frees, 12,230 bytes allocated
==11264==
==11264== LEAK SUMMARY:
==11264==    definitely lost: 24 bytes in 1 blocks
==11264==    indirectly lost: 8,192 bytes in 1 blocks
==11264==      possibly lost: 0 bytes in 0 blocks
==11264==    still reachable: 0 bytes in 0 blocks
==11264==         suppressed: 0 bytes in 0 blocks
==11264== Rerun with --leak-check=full to see details of leaked memory
==11264==
==11264== For counts of detected and suppressed errors, rerun with: -v
==11264== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 4 from 4)
Merge branch 'release/0.4.15'
Merge pull request #38 from jbro/master

Added function evhtp_unbind_socket
Merge branch 'release/0.4.16'
Merge branch 'release/0.4.17'
Merge branch 'release/1.0.0'
Merge branch 'release/1.0.1'
Merge branch 'release/1.1.0'

Conflicts:
	evhtp.c
Merge branch 'release/1.1.1'
Merge branch 'release/1.1.2'
Merge branch 'release/1.1.3'
Removing conflicting code from master branch.
Merge branch 'master' into develop
Merge branch 'develop' of github.com:ellzey/libevhtp into develop
Changed default configuration file path to config/vines.rb
First test on rails integration
Fixed simple active record / devise integration. Need documentation ... and tests !
Work search: give people options to choose from for archive-defined tags
* helm-font.el: New file
* helm-config.el: Move code there
* helm-external.el: Add missing var.
Add route trace
This Week in Ember tweaks
Added Groupon Logo
[bucket] Improve "what was that"
ignoring maven output and intellij files
fixed roboguice version, updated to maps version from maven android sdk deployer, updated maven android plugin
updated to maps version from maven android sdk deployer
removed usage of local repository in filesystem
moved readme to markdown file
removed empty unused readme
consistent android version for sdk platform, dependencies and maps, plugin updates
removed hg files
updated support library version
spelling and style fix
Merge branch 'buildupdate' of https://github.com/mosabua/roboguice into mosabua-buildupdate

Conflicts:
	.gitignore
	README.md
multiple wordpress forms supports
Bump version number on about image (jpg)
Fix missing _ in check for if def check
initial _sbrk() implementation
Provide an _sbrk() function to newlib that allocates memory from
RAM.  Changed to a stack that starts at the highest memory
address and grows down. Heap allocates after bss and grows towards
the stack. Heap and stack collisions are possible.  New lib seems to
grow the heap in 4k allocations so we probably won't see collisions.
add support for array versions of new and delete
fix the name of the source file so gdb can view it
Merge branch 'stellarpad' of github.com:energia/Energia into stellarpad
Merge branch 'stellarpad' of github.com:energia/Energia into stellarpad
more fixes for new and compilation tweaks
jquery UI 1.9.0 + themes
group page: fixed discussion categories bug. added tests.
Increase comment-info font-size
Merge pull request #219 from enspiral/bug/discussions-showing-twice

group page: fixed discussion categories bug. added tests.
Merge branch 'master' of github.com:enspiral/loomio into feature/preview-graphs

* 'master' of github.com:enspiral/loomio:
  Do not add loomio helper discussion to subggroups.
  logged in user viewing public group bug
  template added for info-help
  Install cucumber.
  Auto-focus to input fields after aadd new group members/vote button press
  Fix help notice bugs.
  Improve wording language
  Fix failing tests.
  failing specs
  wording change
  seed user added
  fixed failing mailer specs
  new motion helper text added

Conflicts:
	app/assets/javascripts/groups.js.coffee
	app/assets/javascripts/votes.js.coffee
	app/views/dashboard/show.html.haml
	app/views/groups/show.html.haml
merge marker removed
added graph back in for closed motions
Fix discussion title width on dashboard
Merge pull request #159 from enspiral/bug/discussion-title-width

Fix discussion title width on dashboard
fix displaying bug from indrouction of form
icon transparency raised
Merge branch 'staging' of github.com:enspiral/loomio into bug/activity-icon

* 'staging' of github.com:enspiral/loomio:
  Sorted discussions and corrected their display info.
  fixed logo hover
Merge pull request #151 from enspiral/bug/activity-icon

Bug/activity icon
non fitta
trim EOL whitespace
Update the destruction logic.

This change allows parents to cleanup children before the child is
destroyed.
custom destructor no longer needed
Custom destructor no longer needed
Update dynamic child handling
Add proper support for dynamic children
Adjusted Template
Added monitoring elements to stewardship area show
added approval dates to property
logos & risktut update
Fixed spelling mistake.
Merge pull request #4 from eirc/spelling_mistake

Spelling mistake
Don't create new FluentStringsMap when there's no param to be set, close #578
Add one more test on cookie with missing domain
first draft for the HEAD requests #493
Merge pull request #531 from nire/head_requests

Support for HEAD requests #493
Revamped SNS support.
JCR-1739: JCR Session unclosed in GroovyScript2RestLoader.start()

Fix description:
	* Avoid null session of GroovyScript2RestLoader
	* Log out session containing GroovyScript2RestLoader if neccessary
feature #35 fixed
Сделал фильтр по статусу чекбоксами.
feature #41 fixed
Убрал свойство $TABLE из моделей. Теперь используется статическая константа TABLE. (Late Static Binding)
feature #44
* Куча мелких правок
* Переделал форму запроса
Merge branch 'feature35'
Merge branch 'feature44'
Merge branch 'feature41'
Create ru.yml

Translation file
More fixes for clipboard.
Added Bespin as colorscheme. Replace yankstack for yankring, at least for the moment
Added Bespin as colorscheme. Replace yankstack for yankring, at least for the moment
- Increase gap between console and editors to 20px for visual
  consistency
Updated README and assets project.
Added ItemCache::getItemPropsCopy to simplify copying of items.
Added update action id and refactored SimpleSpawnerItem to use action
ids.
Extended SimpleSpawnerItem with target marker.
Fixed #335: Missing template folder when installing with pip/easy_install
Administration: If all elements in a region are deleted, the empty message is visible and it is possible adding new content types which are displayed correctly.
var added.
FIX frontend_editing error introduced in dd087a9af2166cc942f4c80cd7c0cfd172440f71

cookie `frontend_editing` is set only user has permission
Replace session for COOKIE for frontend_editing in other places
Replace session to COOKIE for frontend_editing in tests too
Assure fe_tools is always on top with higher z-index
Merge pull request #338 from valtron/master

Fix copying non-py files during install on windows
Merge branch 'master' of git://github.com/raphaa/feincms

* 'master' of git://github.com/raphaa/feincms:
  var added.
  Administration: If all elements in a region are deleted, the empty message is visible and it is possible adding new content types which are displayed correctly.
Merge remote-tracking branch 'official/master'

* official/master:
  Fixed #335: Missing template folder when installing with pip/easy_install
Merge branch 'master' into next

* master:
  Assure fe_tools is always on top with higher z-index
  Replace session to COOKIE for frontend_editing in tests too
  Replace session for COOKIE for frontend_editing in other places
  FIX frontend_editing error introduced in dd087a9af2166cc942f4c80cd7c0cfd172440f71
  var added.
  Administration: If all elements in a region are deleted, the empty message is visible and it is possible adding new content types which are displayed correctly.
  Fixed #335: Missing template folder when installing with pip/easy_install

Conflicts:
	feincms/models.py
Fix an inconsistency in get_original_translation: Raise if not exists
add Args param for action
Added missing packages to requirements.txt
Start on response
delete two previous posts
fix rotation corner case better
Updated link to new discussion group layout
Replaced FAQ translation by "help" (related to issue 5590)
FBTest: mutation is async so wait for it
Merge branch 'master' of github.com:firebug/firebug
Merge branch 'master' of github.com:firebug/firebug
Merge branch 'master' of github.com:firebug/firebug
Merge branch 'master' of github.com:firebug/firebug
Make sure tests run with supported Firefox version
Merge branch 'master' of github.com:firebug/firebug
Crops file names in location list
Issue 5959: Help command doesn't work on Mac

http://code.google.com/p/fbug/issues/detail?id=5959
hot fix: remove keep_count
htmlファイルが#着いてるのでもういっちょ
pr_role as component of pr_pentity, fix another Python-2.6 bug
pr_affiliation as component of pr_role, bug fix in pentity_represent
Merge branch 'master' of git://github.com/flavour/eden
List the sdk components.
updated kron-inline with news for kron.prod in cpp! RcppArmadillo does the trick! deleted mypackage and Ctools. do elsewhere.
mostly implemented ending of current scheduled maintenance periods
closes gh-10 - end a current scheduled maintenance period via web ui
remove acknowledge.haml as it's no longer used
kill some superfluous lines
Merge pull request #47 from jessereynolds/gh-10_end_current_scheduled_maintenance

gh-10 end a current scheduled maintenance period via web ui
fix issue with pagerduty acknowledgement detection
Merge branch 'master' of github.com:flpjck/flapjack
bump version, update Gemfile.lock etc
added lots more stats to /static/
try to always return share1a
Merge pull request #19 from goblin/always_1a

Always 1a
Item12180: First pass support for SSL verification & related plumbing

git-svn-id: http://svn.foswiki.org/trunk@16220 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item12023: Use our @ISA, not use base

git-svn-id: http://svn.foswiki.org/trunk@15541 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
new log
学习cpp-markdown成果
MFC r236247 (pjd):
Remove unused sysctl.
MFC: r237836

mps(4) is endian safe as of r237876.
MFC r240465:
Add global and per-module sysctls/tunables to enable/disable metadata taste.
That should help to handle some cases when disk has some RAID metadata that
should be ignored, especially during boot.
MFC r239870:

Teach gdb about the DW_FORM_flag_present dwarf attribute, so it doesn't
error out on files that contain it.  (This attribute can be emitted by
newer versions of clang.)
If the maximum payload size is 256 bytes or more, set the DMA write
water mark to 256 bytes.  Otherwise controller will encounter DMA
write under run errors and would result in RX DMA hang. If the
maximum payload size is 128 bytes, the water mark is set to 128
bytes as usual.
While here, set maximum read request size to 2048 for BCM5719/BCM5720.
For other PCIe devices, use 4096. And reprogram the maximum read
request size whenever device reset is performed.
Fully initialize the stack-allocated "struct sockaddr_in sa" structure.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240191 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Use "e.g.", not "i.e.", to introduce an example.

Obtained from:	NetBSD


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240192 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Stash the 'vm_exit' information in each 'struct vcpu'.

There is no functional change at this time but this paves the way for vm exit
handler functions to easily modify the exit reason going forward.
Implement support for USB Audio v2.0. Remove some redundant
USB audio v1.0 debug data, hence userspace tools like lsusb
exist to show this information properly.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240609 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Adding Git note for current refs/heads/stable/8
Adding Git note for current refs/heads/projects/nand
MFC r235036:

Add ToS definitions for DiffServ Codepoints as per RFC2474.

Obtained from:	OpenBSD
Adding Git note for current refs/heads/stable/9
Adding Git note for current refs/heads/master
Adding Git note for current refs/heads/stable/8
Adding Git note for current refs/heads/stable/7
Make sure sections are sorted into conventional order.
Fix an obvious typo.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240830 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
zfs: allow a zvol to be used as a pool vdev, again

Do this by checking if spa_namespace_lock is already held and not taking
it again in that case.
Add a comment explaining why that is done and why it is safe.

Reviewed by:	pjd
MFC after:	24 days


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240831 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Make the example a bit more pretty.


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


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240833 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Add rounddown2() macro similar to the roundup2() macro.


git-svn-id: svn+ssh://svn.freebsd.org/base/head@240834 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Change SIGUSR1 to SIGTHR to properly wake up a process that is being
traced.  The use of SIGUSR1 caused traced processes (those attached to
with dtrace -p) to exit when dtrace exited.

MFC in: 1 week
Flesh out the rest of the AP96 board/config.
correct paste hostname
correct hostname of tungsten
add a couple missing hosts
this should make things marginally faster
Implemented LDAP auth.
Better logging of auth, timeout added.
zai test1 shang gai le abc
master xiugai le abc
merge test1
gai le abc
test1 gai le efg
hotfix gai le abc
gai le efg
gai le abc
vimrc: putting back autoindent and filetype indent

Not putting back annoying html autoindent.
make java 7 and java 6 version of BAI
commit conedigger output
vec.js refactor is almost done. multiplication order remains to be done
FileManager errors
[avr] ChristmasTree FSM progress
More efforts on getting this darn thing to build
get scenes in a chapter property, modal dialog got scene page
adding missing files from modal dialogs
tighten up limitations on who can access what - filter options in the artifact and location fields
added 50-second timeout to weblet channel server
fix issue with all emails being fetched seen as SEEN. Now fixed
Added partial code to improve the description of pairwise summary results.
Added the revMapLimma function and the plot functions.
Still to do:
Fix the plotting function (the legend is still broken).
See the previous commit message for other issues.
Adding global and local options to set line endings
additions for pyclewn
Added Sinatra link in lower position
moved class PyCardDav to pycard.py
playing that pep8 game
wip: card editor
wip: editor
removed name function, replaced with varibale fn
wip: worked some more on the card editor
rank_selection method in lib/population.rb
three_parent_crossover method in lib/individual.rb
refactor Individual object.
json-object passing from java server to client works - returned
json-object gets transformed into a html table
fix ls.linux2.c
fix form-element multi-checkbox and radio renderError
Merge branch 'hotfix/2644'

Close #2644
unit test added
unit test added
AbstractPluginManager should not respond to ServiceManagerAwareInterface; that is a more specific marker not intended for generic plugins.
Merge branch 'fix/form-row-render-multi-radio-errorelement' of https://github.com/samsonasik/zf2 into hotfix/2641
[#2641] CS fixes

- Trailing whitespace
Merge branch 'hotfix/2641' into develop

Forward port #2641
Merge branch 'hotfix/servicemanagerawareinterface-cleanup' of https://github.com/demiankatz/zf2 into hotfix/2648
[#2648] Added note to README.md

- Noted the change in README.md
Merge branch 'hotfix/2648' into develop

Close #2648
Deliver strategies-related update
Update notes for submitted changes

* Define separate storage backends for large objects
Update notes for submitted changes

* Upgrade Varnish on all upload caches to 3.0.3~rc1-wm2
rock paper scissors
putting the frontend files here
configured node so it can serve stuff from frontend
latest frontend files
easy to find where to put game
added scripts and css to the right directories
tell node to use frontend/index.html instead of game
added all the javascript libraries that the game.html has to function with node onto index.html
Merged with other code
´testing-testing´
Allow update of aaa_elflibs.
Add kmod workaround.
poukładany swiat
creación de scaffold site
site seeds.db y migración site
type - site relation
Adaptacion vistas a relaciones modelo
Rutas anidadas types/:id/sites
Cambio de look con nuevas vistas y CSS
７行目を変更

7 + の後に * を追加
７行目を変更

7 + * の後に - を追加
６行目を変更

6 の後に * を追加
８行目をマージ

8の後に$#を追加
Merge branch 'master' of github.com:git-dojo/team06

Conflicts:
	Numbers
Merge branch 'master' of github.com:git-dojo/team06
Adding New Sitemap
Contacts index view tests
add Readability support (via ifttt)
make operation links at bottom look like buttons
Added api v2.
Merge branch 'api'
refine proxy.py start_response
time() is significantly faster than strtotime().
File's existence should be checked before getting the modification date.
Fixed tests by passing Buffer to vm_harness.
No longer wait for all task handles to be destroyed:

* Since the application has to insure that no threads are currently
  waiting on a task, or calling any other method at the same time a
  task queue is destroyed, there's no reason for the task queue to
  insure that it has the last handle to tasks because if there's no
  threads waiting on a task, or calling a task queue method, then no
  handles to any task exists.
Added a thread class that manages threads:

* This class makes it easier to create, and join threads.  Especially
  in places where multiple threads are created and need to be joined
  only if the threads were succesfully started.
Add compability for cmake older than 2.8.5
Merge branch 'master' of github.com:gorthauer/vkkit
Comparators for message model
travis status image fix [ci skip]
ajout email aprés valiation absence
absence modif
correct wrong config variable in the sync module
Merge pull request #8 from brot/bugfix

Fix config variable usage in gpodder.sync
Move Year/YearMonth/MonthDay to core module
Move additional fields to calendrical package
Rename LocalDateTimeUnit to LocalPeriodUnit
Move ZoneResolver to zone package
Suppress warnings
Move format package to core module
Reinstate parse/getText methods
Fix ant javadoc
Move Year/YearMonth/MonthDay to calendrical package

In the top package, they confuse learning the key classes
Javadoc DST
Fix offset bug in MinguoChrono
Updated initialization code to avoid initialization ordering problems
Add src-standard to compile-core to fix temporary dependency of the formatter on Chrono

fixes #40
Ensure modifiable map is not exposed
Fix Javadoc
Restrict ChronoDate.compareTo to a single calendar system

fixes #30
Remove roll method

Maybe reinstate later, but right now it doesn't work and is in the way
fixes #34
Merge branch 'master' of git://github.com/ThreeTen/threeten

Conflicts:
	build.xml
	src-standard/main/java/javax/time/chrono/Chrono.java
TAChart: Fix SIGFPE while drawing area series with infinite Y values

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@39072 4005530d-fff6-0310-9dd1-cebe43e6787f
TAChart: Remove TChart.GraphBrush property which did nothing

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@39073 4005530d-fff6-0310-9dd1-cebe43e6787f